Skip to content

[release-3.1] OSSM-11244: Do not use default annotations from chart/values.yaml #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Dec 2, 2025
Merged

[release-3.1] OSSM-11244: Do not use default annotations from chart/values.yaml #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ metadata:
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: ${OSSM_OPERATOR_3_1}
createdAt: "2025-10-24T11:25:36Z"
createdAt: "2025-12-01T11:26:16Z"
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"
Expand Down
34 changes: 1 addition & 33 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,7 @@
name: sailoperator
deployment:
name: sail-operator
annotations:
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_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_24_6.ztunnel: gcr.io/istio-release/ztunnel:1.24.6
images.v1_24_6.istiod: gcr.io/istio-release/pilot:1.24.6
images.v1_24_6.proxy: gcr.io/istio-release/proxyv2:1.24.6
images.v1_24_6.cni: gcr.io/istio-release/install-cni:1.24.6
images.v1_24_5.ztunnel: gcr.io/istio-release/ztunnel:1.24.5
images.v1_24_5.istiod: gcr.io/istio-release/pilot:1.24.5
images.v1_24_5.proxy: gcr.io/istio-release/proxyv2:1.24.5
images.v1_24_5.cni: gcr.io/istio-release/install-cni:1.24.5
images.v1_24_4.ztunnel: gcr.io/istio-release/ztunnel:1.24.4
images.v1_24_4.istiod: gcr.io/istio-release/pilot:1.24.4
images.v1_24_4.proxy: gcr.io/istio-release/proxyv2:1.24.4
images.v1_24_4.cni: gcr.io/istio-release/install-cni:1.24.4
images.v1_24_3.ztunnel: gcr.io/istio-release/ztunnel:1.24.3
images.v1_24_3.istiod: gcr.io/istio-release/pilot:1.24.3
images.v1_24_3.proxy: gcr.io/istio-release/proxyv2:1.24.3
images.v1_24_3.cni: gcr.io/istio-release/install-cni:1.24.3
annotations: {}
service:
port: 8443
serviceAccountName: sail-operator
Expand Down
4 changes: 4 additions & 0 deletions ossm/merge_upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ main () {
rm -rf bundle/**/*.yaml resources bundle.Dockerfile
# TODO, fix this to add versions not replacing them
#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 .

Expand Down
2 changes: 2 additions & 0 deletions ossm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
# 1.24.3 images are hardcoded to versions released with 3.0.0
images.v1_24_3.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9@sha256:d6693c31d6137c4219812cf69097d04654b296e0ab059dc48596a09b9cd124b1
Expand Down