Upgrade kyma from 2.9.3 to 2.11.4 (#3628)

* Initial adaptations * Update kyma version in docs
kyma-incubator · Feb 2, 2024 · 0d71ac5 · 0d71ac5
1 parent 4a19198
commit 0d71ac5
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ For more information about the Compass architecture, technical details, and comp
 
 - [Docker](https://www.docker.com/get-started)
 - [k3d](https://github.com/k3d-io/k3d) v5.2.2+
-- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) 1.23.0+
-- [Kyma CLI](https://github.com/kyma-project/cli) 2.9.3
+- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) 1.25.0+
+- [Kyma CLI](https://github.com/kyma-project/cli) 2.11.2
 - [helm](https://github.com/helm/helm) v3.8.0+
 - [yq](https://github.com/mikefarah/yq) v4+
 

diff --git a/chart/compass/charts/connector/templates/certs-setup-job.yaml b/chart/compass/charts/connector/templates/certs-setup-job.yaml
@@ -15,8 +15,9 @@ spec:
     metadata:
       name: {{ .Chart.Name }}-certs-setup-job
       namespace: {{ .Release.Namespace }}
+      labels:
+        sidecar.istio.io/inject: "false"
       annotations:
-        sidecar.istio.io/inject: “false”
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-certs-setup-job

diff --git a/chart/compass/charts/testing/charts/octopus/templates/manager.yaml b/chart/compass/charts/testing/charts/octopus/templates/manager.yaml
@@ -40,13 +40,13 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "false"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: {{ template "octopus.name" . }}
         control-plane: controller-manager
         controller-tools.k8s.io: "1.0"
         kyma-project.io/component: controller
+        sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: {{ template "octopus.fullname" . }}
       containers:

diff --git a/chart/compass/templates/bench/director/director-bench.yaml b/chart/compass/templates/bench/director/director-bench.yaml
@@ -16,10 +16,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-director-bench-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-director-bench-app
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/bench/ord-service/ord-service-bench.yaml b/chart/compass/templates/bench/ord-service/ord-service-bench.yaml
@@ -16,10 +16,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-ord-service-bench-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-ord-service-bench-app
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/connectivity-adapter/connectivity-adapter-test.yaml b/chart/compass/templates/tests/connectivity-adapter/connectivity-adapter-test.yaml
@@ -16,10 +16,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-connectivity-adapter-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-connectivity-adapter
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/connector/connector-test.yaml b/chart/compass/templates/tests/connector/connector-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-connector-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-connector
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/director/director-test.yaml b/chart/compass/templates/tests/director/director-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-director-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-director
     {{ if eq .Values.global.portieris.isEnabled true }}
@@ -379,10 +379,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-director-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-director
     {{ if eq .Values.global.portieris.isEnabled true }}
@@ -743,10 +743,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-director-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-director
     {{ if eq .Values.global.portieris.isEnabled true }}
@@ -1107,10 +1107,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-director-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-director
     {{ if eq .Values.global.portieris.isEnabled true }}
@@ -1471,10 +1471,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-director-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-director
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/external-services-mock/external-services-mock-test.yaml b/chart/compass/templates/tests/external-services-mock/external-services-mock-test.yaml
@@ -16,10 +16,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-external-services-mock-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
     {{ if eq .Values.global.portieris.isEnabled true }}
       imagePullSecrets:

diff --git a/chart/compass/templates/tests/gateway/gateway-test.yaml b/chart/compass/templates/tests/gateway/gateway-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-gateway-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-gateway
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/istio/istio-test.yaml b/chart/compass/templates/tests/istio/istio-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-istio-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-istio
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/ns-adapter/ns-adapter-test.yaml b/chart/compass/templates/tests/ns-adapter/ns-adapter-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-ns-adapter-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-ns-adapter
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/ord-aggregator/ord-aggregator-test.yaml b/chart/compass/templates/tests/ord-aggregator/ord-aggregator-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-ord-aggregator-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ $.Chart.Name }}-e2e-ord-aggregator
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/ord-service/ord-service-test.yaml b/chart/compass/templates/tests/ord-service/ord-service-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-ord-service-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-ord-service
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/pairing-adapter/pairing-adapter-test.yaml b/chart/compass/templates/tests/pairing-adapter/pairing-adapter-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-pairing-adapter-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ $.Chart.Name }}-e2e-pairing-adapter
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/system-broker/system-broker-test.yaml b/chart/compass/templates/tests/system-broker/system-broker-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-system-broker-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-system-broker
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/system-fetcher/system-fetcher-test.yaml b/chart/compass/templates/tests/system-fetcher/system-fetcher-test.yaml
@@ -16,10 +16,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-system-fetcher-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-system-fetcher
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/chart/compass/templates/tests/tenant-fetcher/tenant-fetcher-test.yaml b/chart/compass/templates/tests/tenant-fetcher/tenant-fetcher-test.yaml
@@ -15,10 +15,10 @@ spec:
   template:
     metadata:
       annotations:
-        sidecar.istio.io/inject: "true"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: {{ .Chart.Name }}-tenant-fetcher-tests-app
+        sidecar.istio.io/inject: "true"
     spec:
       serviceAccountName: {{ .Chart.Name }}-e2e-tenant-fetcher
     {{ if eq .Values.global.portieris.isEnabled true }}

diff --git a/docs/compass/04-01-installation.md b/docs/compass/04-01-installation.md
@@ -46,7 +46,7 @@ Therefore, `serviceAccountTokenJWKS` and `serviceAccountTokenIssuer` need to be
 
 > **NOTE:** During the installation of Compass, the installed Kyma version (as a basis to Compass) must match to the one in the [`KYMA_VERSION`](../../installation/resources/KYMA_VERSION) file in the specific Compass commit.
 
-If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.9.3/docs/03-tutorials/00-security/sec-01-tls-certificates-security.md) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.
+If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.11.4/docs/03-tutorials/00-security/sec-01-tls-certificates-security.md) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.
 
 Save the following .yaml code with installation overrides into a file (for example: additionalKymaOverrides.yaml)
 ```yaml
@@ -390,9 +390,9 @@ To install the Compass and Runtime components on a single cluster, perform the f
 
 > **NOTE:** During the installation of Kyma, the installed version must match to the one in the [`KYMA_VERSION`](../../installation/resources/KYMA_VERSION) file in the specific Compass commit.
 
-You must have a Kyma installation with enabled Runtime Agent. For more information, see [Enable Kyma with Runtime Agent](https://github.com/kyma-project/kyma/blob/2.9.3/docs/04-operation-guides/operations/ra-01-enable-kyma-with-runtime-agent.md). Therefore, you must add the compass-runtime-agent module in the compass-system namespace to the list of [minimal kyma components file](../../installation/resources/kyma/kyma-components-minimal.yaml).
+You must have a Kyma installation with enabled Runtime Agent. For more information, see [Enable Kyma with Runtime Agent](https://github.com/kyma-project/kyma/blob/2.11.4/docs/04-operation-guides/operations/ra-01-enable-kyma-with-runtime-agent.md). Therefore, you must add the compass-runtime-agent module in the compass-system namespace to the list of [minimal kyma components file](../../installation/resources/kyma/kyma-components-minimal.yaml).
 
-If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.9.3/docs/03-tutorials/00-security/sec-01-tls-certificates-security.md) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.
+If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.11.4/docs/03-tutorials/00-security/sec-01-tls-certificates-security.md) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.
 
 Save the following .yaml code with installation overrides to a file (for example: additionalKymaOverrides.yaml)
 ```yaml

diff --git a/installation/resources/KYMA_VERSION b/installation/resources/KYMA_VERSION
@@ -1 +1 @@
-2.9.3
+2.11.4
diff --git a/installation/resources/kyma/kyma-overrides-minimal.yaml b/installation/resources/kyma/kyma-overrides-minimal.yaml
@@ -30,17 +30,17 @@ istio:
     images:
       istio_proxyv2:
         name: "proxyv2"
-        version: "1.15.3-distroless"
+        version: "1.16.2-distroless"
         directory: "istio"
         containerRegistryPath: "docker.io"
       istio_pilot:
         name: "pilot"
-        version: "1.15.3-distroless"
+        version: "1.16.2-distroless"
         directory: "istio"
         containerRegistryPath: "docker.io"
       istio_install-cni:
         name: "install-cni"
-        version: "1.15.3-distroless"
+        version: "1.16.2-distroless"
         directory: "istio"
         containerRegistryPath: "docker.io"
 
@@ -116,7 +116,7 @@ monitoring:
   alertmanager:
     alertmanagerSpec:
       podMetadata:
-        annotations:
+        labels:
           sidecar.istio.io/inject: "true"
       resources:
         limits:
@@ -168,7 +168,7 @@ monitoring:
           memory: 1Gi
   prometheusOperator:
     configReloaderMemory: 256Mi
-    podAnnotations:
+    podLabels:
       sidecar.istio.io/inject: "true"
   prometheus-node-exporter:
     prometheus:
@@ -181,7 +181,7 @@ monitoring:
           keyFile: /etc/prometheus/secrets/istio.default/key.pem
           insecureSkipVerify: true
   kube-state-metrics:
-    podAnnotations:
+    customLabels:
       sidecar.istio.io/inject: "true"
     prometheus:
       monitor:

diff --git a/installation/scripts/prow/jobs/compass-gke-benchmark.sh b/installation/scripts/prow/jobs/compass-gke-benchmark.sh
@@ -162,7 +162,7 @@ function installHelm() {
 }
 
 function installKymaCLI() {
-  KYMA_CLI_VERSION="2.9.3"
+  KYMA_CLI_VERSION="2.11.2"
   log::info "Installing Kyma CLI version: $KYMA_CLI_VERSION"
 
   PREV_WD=$(pwd)

diff --git a/installation/scripts/prow/jobs/provision-compass.sh b/installation/scripts/prow/jobs/provision-compass.sh
@@ -48,7 +48,7 @@ cp yq "$HOME/bin/yq" && cp yq "/usr/local/bin/yq"
 log::info "Successfully installed yq version: $YQ_VERSION"
 
 # Install Kyma to be later used in run.sh
-KYMA_CLI_VERSION="2.9.3"
+KYMA_CLI_VERSION="2.11.2"
 log::info "Installing Kyma CLI version: $KYMA_CLI_VERSION"
 
 curl -Lo kyma.tar.gz "https://github.com/kyma-project/cli/releases/download/${KYMA_CLI_VERSION}/kyma_Linux_x86_64.tar.gz" \