From fef8faf77ef55f3510ca6859989ba2527857ebf4 Mon Sep 17 00:00:00 2001 From: Filip Brychta Date: Mon, 1 Dec 2025 12:13:10 +0100 Subject: [PATCH] OSSM-11244: Do not use default annotations from chart/values.yaml Even if we specify ossm/values.yaml via HELM_VALUES_FILE, helm by design merges annotations specified in chart/values.yaml and ossm/values.yaml. To only keep annotations specified in ossm/values.yaml, it's necessary to overwrite all annotations in chart/values.yaml. This is done when merging upstream changes via ossm/merge_upstream.sh --- ...cemeshoperator3.clusterserviceversion.yaml | 54 +------------------ chart/values.yaml | 54 +------------------ ossm/merge_upstream.sh | 3 ++ ossm/values.yaml | 2 + 4 files changed, 7 insertions(+), 106 deletions(-) diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml index b3ce6d9c1..fe6d36eac 100644 --- a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml +++ b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml @@ -45,7 +45,7 @@ metadata: capabilities: Seamless Upgrades categories: OpenShift Optional, Integration & Delivery, Networking, Security containerImage: quay.io/maistra-dev/sail-operator:3.0-latest - createdAt: "2025-11-28T12:06:40Z" + createdAt: "2025-12-01T11:10:33Z" description: The OpenShift Service Mesh Operator enables you to install, configure, and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service Mesh is based on the open source Istio project. features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "true" @@ -731,58 +731,6 @@ spec: images.v1_24_4.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.1 images.v1_24_4.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:1.24.4 images.v1_24_4.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.24.4 - images.v1_26_0.cni: gcr.io/istio-release/install-cni:1.26.0 - images.v1_26_0.istiod: gcr.io/istio-release/pilot:1.26.0 - images.v1_26_0.proxy: gcr.io/istio-release/proxyv2:1.26.0 - images.v1_26_0.ztunnel: gcr.io/istio-release/ztunnel:1.26.0 - images.v1_26_1.cni: gcr.io/istio-release/install-cni:1.26.1 - images.v1_26_1.istiod: gcr.io/istio-release/pilot:1.26.1 - images.v1_26_1.proxy: gcr.io/istio-release/proxyv2:1.26.1 - images.v1_26_1.ztunnel: gcr.io/istio-release/ztunnel:1.26.1 - images.v1_26_2.cni: gcr.io/istio-release/install-cni:1.26.2 - images.v1_26_2.istiod: gcr.io/istio-release/pilot:1.26.2 - images.v1_26_2.proxy: gcr.io/istio-release/proxyv2:1.26.2 - images.v1_26_2.ztunnel: gcr.io/istio-release/ztunnel:1.26.2 - images.v1_26_3.cni: gcr.io/istio-release/install-cni:1.26.3 - images.v1_26_3.istiod: gcr.io/istio-release/pilot:1.26.3 - images.v1_26_3.proxy: gcr.io/istio-release/proxyv2:1.26.3 - images.v1_26_3.ztunnel: gcr.io/istio-release/ztunnel:1.26.3 - images.v1_26_4.cni: gcr.io/istio-release/install-cni:1.26.4 - images.v1_26_4.istiod: gcr.io/istio-release/pilot:1.26.4 - images.v1_26_4.proxy: gcr.io/istio-release/proxyv2:1.26.4 - images.v1_26_4.ztunnel: gcr.io/istio-release/ztunnel:1.26.4 - images.v1_26_5.cni: gcr.io/istio-release/install-cni:1.26.5 - images.v1_26_5.istiod: gcr.io/istio-release/pilot:1.26.5 - images.v1_26_5.proxy: gcr.io/istio-release/proxyv2:1.26.5 - images.v1_26_5.ztunnel: gcr.io/istio-release/ztunnel:1.26.5 - images.v1_26_6.cni: gcr.io/istio-release/install-cni:1.26.6 - images.v1_26_6.istiod: gcr.io/istio-release/pilot:1.26.6 - images.v1_26_6.proxy: gcr.io/istio-release/proxyv2:1.26.6 - images.v1_26_6.ztunnel: gcr.io/istio-release/ztunnel:1.26.6 - images.v1_27_0.cni: gcr.io/istio-release/install-cni:1.27.0 - images.v1_27_0.istiod: gcr.io/istio-release/pilot:1.27.0 - images.v1_27_0.proxy: gcr.io/istio-release/proxyv2:1.27.0 - images.v1_27_0.ztunnel: gcr.io/istio-release/ztunnel:1.27.0 - images.v1_27_1.cni: gcr.io/istio-release/install-cni:1.27.1 - images.v1_27_1.istiod: gcr.io/istio-release/pilot:1.27.1 - images.v1_27_1.proxy: gcr.io/istio-release/proxyv2:1.27.1 - images.v1_27_1.ztunnel: gcr.io/istio-release/ztunnel:1.27.1 - images.v1_27_2.cni: gcr.io/istio-release/install-cni:1.27.2 - images.v1_27_2.istiod: gcr.io/istio-release/pilot:1.27.2 - images.v1_27_2.proxy: gcr.io/istio-release/proxyv2:1.27.2 - images.v1_27_2.ztunnel: gcr.io/istio-release/ztunnel:1.27.2 - images.v1_27_3.cni: gcr.io/istio-release/install-cni:1.27.3 - images.v1_27_3.istiod: gcr.io/istio-release/pilot:1.27.3 - images.v1_27_3.proxy: gcr.io/istio-release/proxyv2:1.27.3 - images.v1_27_3.ztunnel: gcr.io/istio-release/ztunnel:1.27.3 - images.v1_28_0.cni: gcr.io/istio-release/install-cni:1.28.0 - images.v1_28_0.istiod: gcr.io/istio-release/pilot:1.28.0 - images.v1_28_0.proxy: gcr.io/istio-release/proxyv2:1.28.0 - images.v1_28_0.ztunnel: gcr.io/istio-release/ztunnel:1.28.0 - images.v1_29-alpha_b2f713a9.cni: gcr.io/istio-testing/install-cni:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 - images.v1_29-alpha_b2f713a9.istiod: gcr.io/istio-testing/pilot:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 - images.v1_29-alpha_b2f713a9.proxy: gcr.io/istio-testing/proxyv2:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 - images.v1_29-alpha_b2f713a9.ztunnel: gcr.io/istio-testing/ztunnel:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 kubectl.kubernetes.io/default-container: sail-operator labels: app.kubernetes.io/created-by: servicemeshoperator3 diff --git a/chart/values.yaml b/chart/values.yaml index 04eff661c..d814aeb53 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,59 +1,7 @@ name: sailoperator deployment: name: sail-operator - annotations: - images.v1_28_0.ztunnel: gcr.io/istio-release/ztunnel:1.28.0 - images.v1_28_0.istiod: gcr.io/istio-release/pilot:1.28.0 - images.v1_28_0.proxy: gcr.io/istio-release/proxyv2:1.28.0 - images.v1_28_0.cni: gcr.io/istio-release/install-cni:1.28.0 - images.v1_27_3.ztunnel: gcr.io/istio-release/ztunnel:1.27.3 - images.v1_27_3.istiod: gcr.io/istio-release/pilot:1.27.3 - images.v1_27_3.proxy: gcr.io/istio-release/proxyv2:1.27.3 - images.v1_27_3.cni: gcr.io/istio-release/install-cni:1.27.3 - images.v1_27_2.ztunnel: gcr.io/istio-release/ztunnel:1.27.2 - images.v1_27_2.istiod: gcr.io/istio-release/pilot:1.27.2 - images.v1_27_2.proxy: gcr.io/istio-release/proxyv2:1.27.2 - images.v1_27_2.cni: gcr.io/istio-release/install-cni:1.27.2 - images.v1_27_1.ztunnel: gcr.io/istio-release/ztunnel:1.27.1 - images.v1_27_1.istiod: gcr.io/istio-release/pilot:1.27.1 - images.v1_27_1.proxy: gcr.io/istio-release/proxyv2:1.27.1 - images.v1_27_1.cni: gcr.io/istio-release/install-cni:1.27.1 - images.v1_27_0.ztunnel: gcr.io/istio-release/ztunnel:1.27.0 - images.v1_27_0.istiod: gcr.io/istio-release/pilot:1.27.0 - images.v1_27_0.proxy: gcr.io/istio-release/proxyv2:1.27.0 - images.v1_27_0.cni: gcr.io/istio-release/install-cni:1.27.0 - images.v1_26_6.ztunnel: gcr.io/istio-release/ztunnel:1.26.6 - images.v1_26_6.istiod: gcr.io/istio-release/pilot:1.26.6 - images.v1_26_6.proxy: gcr.io/istio-release/proxyv2:1.26.6 - images.v1_26_6.cni: gcr.io/istio-release/install-cni:1.26.6 - images.v1_26_5.ztunnel: gcr.io/istio-release/ztunnel:1.26.5 - images.v1_26_5.istiod: gcr.io/istio-release/pilot:1.26.5 - images.v1_26_5.proxy: gcr.io/istio-release/proxyv2:1.26.5 - images.v1_26_5.cni: gcr.io/istio-release/install-cni:1.26.5 - images.v1_26_4.ztunnel: gcr.io/istio-release/ztunnel:1.26.4 - images.v1_26_4.istiod: gcr.io/istio-release/pilot:1.26.4 - images.v1_26_4.proxy: gcr.io/istio-release/proxyv2:1.26.4 - images.v1_26_4.cni: gcr.io/istio-release/install-cni:1.26.4 - images.v1_26_3.ztunnel: gcr.io/istio-release/ztunnel:1.26.3 - images.v1_26_3.istiod: gcr.io/istio-release/pilot:1.26.3 - images.v1_26_3.proxy: gcr.io/istio-release/proxyv2:1.26.3 - images.v1_26_3.cni: gcr.io/istio-release/install-cni:1.26.3 - images.v1_26_2.ztunnel: gcr.io/istio-release/ztunnel:1.26.2 - images.v1_26_2.istiod: gcr.io/istio-release/pilot:1.26.2 - images.v1_26_2.proxy: gcr.io/istio-release/proxyv2:1.26.2 - images.v1_26_2.cni: gcr.io/istio-release/install-cni:1.26.2 - images.v1_26_1.ztunnel: gcr.io/istio-release/ztunnel:1.26.1 - images.v1_26_1.istiod: gcr.io/istio-release/pilot:1.26.1 - images.v1_26_1.proxy: gcr.io/istio-release/proxyv2:1.26.1 - images.v1_26_1.cni: gcr.io/istio-release/install-cni:1.26.1 - images.v1_26_0.ztunnel: gcr.io/istio-release/ztunnel:1.26.0 - images.v1_26_0.istiod: gcr.io/istio-release/pilot:1.26.0 - images.v1_26_0.proxy: gcr.io/istio-release/proxyv2:1.26.0 - images.v1_26_0.cni: gcr.io/istio-release/install-cni:1.26.0 - images.v1_29-alpha_b2f713a9.ztunnel: gcr.io/istio-testing/ztunnel:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 - images.v1_29-alpha_b2f713a9.istiod: gcr.io/istio-testing/pilot:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 - images.v1_29-alpha_b2f713a9.proxy: gcr.io/istio-testing/proxyv2:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 - images.v1_29-alpha_b2f713a9.cni: gcr.io/istio-testing/install-cni:1.29-alpha.b2f713a9c7879a0c736388ff854f94c904dcc816 + annotations: {} revisionHistoryLimit: 10 service: port: 8443 diff --git a/ossm/merge_upstream.sh b/ossm/merge_upstream.sh index 33757b336..032d9775a 100755 --- a/ossm/merge_upstream.sh +++ b/ossm/merge_upstream.sh @@ -74,6 +74,9 @@ main () { # generate everything regardless of detected conflicts rm -rf bundle/**/*.yaml resources bundle.Dockerfile updateVersionsInOssmValuesYaml + # even if we specify ossm/values.yaml via HELM_VALUES_FILE, helm by design merges annotations specified in chart/values.yaml and ossm/values.yaml + # to only keep annotations specified in ossm/values.yaml, it's necessary to overwrite all annotations in chart/values.yaml + yq -i '.deployment.annotations = {}' chart/values.yaml make gen git add . diff --git a/ossm/values.yaml b/ossm/values.yaml index 7463c9ab3..6cfe4eda9 100644 --- a/ossm/values.yaml +++ b/ossm/values.yaml @@ -1,6 +1,8 @@ name: servicemeshoperator3 deployment: name: servicemesh-operator3 + # even if we specify ossm/values.yaml via HELM_VALUES_FILE, helm by design merges annotations specified in chart/values.yaml and ossm/values.yaml + # to only keep annotations specified in ossm/values.yaml, it's necessary to overwrite all annotations in chart/values.yaml. This is done when merging upstream changes via ossm/merge_upstream.sh annotations: images.v1_24_4.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.24.4 images.v1_24_4.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:1.24.4