Skip to content

Commit

Permalink
chore: Prepare images for 1.26.2 release (#1583)
Browse files Browse the repository at this point in the history
  • Loading branch information
skhalash authored Oct 31, 2024
1 parent 937ed00 commit c4fbced
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Default Environment Variables
## General
ENV_K3S_K8S_VERSION=1.30.5 # refers to the version of kubernetes used in K3s
ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.26.1 # Image URL to use all building/pushing image targets
ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.26.2 # Image URL to use all building/pushing image targets

## Gardener
ENV_GARDENER_K8S_VERSION=1.30
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ kind: Kustomization
images:
- name: controller
newName: europe-docker.pkg.dev/kyma-project/prod/telemetry-manager
newTag: 1.26.1
newTag: 1.26.2
2 changes: 1 addition & 1 deletion docs/user/03-traces.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ spec:

#### **Trace Context Without Spans**

To enable the propagation of the [W3C Trace Context](https://www.w3.org/TR/trace-context/) only, without reporting any spans (so the actual tracing feature is disabled), you must enable the `kyma-traces` provider with a sampling rate of 0. With this configuration, you get the relevant trace context into the [access logs](https://kyma-project.io/#/istio/user/operation-guides/02-30-enable-istio-access-logs) without any active trace reporting.
To enable the propagation of the [W3C Trace Context](https://www.w3.org/TR/trace-context/) only, without reporting any spans (so the actual tracing feature is disabled), you must enable the `kyma-traces` provider with a sampling rate of 0. With this configuration, you get the relevant trace context into the [access logs](https://kyma-project.io/#/istio/user/tutorials/01-45-enable-istio-access-logs) without any active trace reporting.

```yaml
apiVersion: telemetry.istio.io/v1
Expand Down
6 changes: 2 additions & 4 deletions docs/user/integration/sap-cloud-logging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,9 @@ You can set up shipment of applications and access logs to SAP Cloud Logging. Th
By default, Istio sidecar injection and Istio access logs are disabled in Kyma. To analyze access logs of your workload in the default SAP Cloud Logging dashboards shipped for SAP BTP, Kyma runtime, you must enable them:
3. Enable Istio sidecar injection for your workload. See [Enabling Istio Sidecar Injection](https://kyma-project.io/#/istio/user/operation-guides/02-20-enable-sidecar-injection).
1. Enable Istio sidecar injection for your workload. See [Enabling Istio Sidecar Injection](https://kyma-project.io/#/istio/user/tutorials/01-40-enable-sidecar-injection).
1. Enable Istio sidecar injection for your workload. See [Enabling Istio Sidecar Injection](https://kyma-project.io/#/istio/user/operation-guides/02-20-enable-sidecar-injection).
2. Enable Istio access logs for your workload. See [Enable Istio access logs](https://kyma-project.io/#/istio/user/operation-guides/02-30-enable-istio-access-logs).
2. Enable Istio access logs for your workload. See [Configuring Istio Access Logs](https://kyma-project.io/#/istio/user/tutorials/01-45-enable-istio-access-logs).
3. Deploy the LogPipeline for Istio access logs and enable access logs in Kyma with the following script:
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var (
setupLog = ctrl.Log.WithName("setup")
telemetryNamespace string
//TODO: replace with build version based on git revision
version = "1.26.1"
version = "1.26.2"

// Operator flags
certDir string
Expand All @@ -88,7 +88,7 @@ var (
const (
defaultFluentBitExporterImage = "europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241001-21f80ba0"
defaultFluentBitImage = "europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.1.9"
defaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.111.0-1.26.0"
defaultOTelCollectorImage = "europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.111.0-1.26.1"
defaultSelfMonitorImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:2.53.2-cc4f64c"

cacheSyncPeriod = 1 * time.Minute
Expand Down
4 changes: 2 additions & 2 deletions sec-scanners-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module-name: telemetry
protecode:
- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.26.1
- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.111.0-1.26.0
- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.26.2
- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.111.0-1.26.1
- europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.1.9
- europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241001-21f80ba0
- europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:2.53.2-cc4f64c
Expand Down

0 comments on commit c4fbced

Please sign in to comment.