Skip to content

[release-1.27] Fix ztunel version in samples and bundle alm-examples #1771

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
istio-testing merged 2 commits into from
Apr 7, 2026
Merged

[release-1.27] Fix ztunel version in samples and bundle alm-examples #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cb16af
Fix ztunnel version enumeration in update-version-list script (#1416)
sridhargaddam Dec 10, 2025
49b213e
Regenerate catalog after ztunnel fix backported
mkralik3 Mar 31, 2026
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
4 changes: 2 additions & 2 deletions bundle/manifests/sailoperator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ metadata:
},
"spec": {
"namespace": "ztunnel",
"version": "v1.27.3"
"version": "v1.27.8"
}
}
]
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: quay.io/sail-dev/sail-operator:1.27.8
createdAt: "2026-03-23T11:16:23Z"
createdAt: "2026-03-31T13:26:40Z"
description: The Sail Operator manages the lifecycle of your Istio control plane. It provides custom resources for you to deploy and manage your control plane components.
features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "true"
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/ztunnel-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ kind: ZTunnel
metadata:
name: default
spec:
version: v1.27.3
version: v1.27.8
namespace: ztunnel
17 changes: 8 additions & 9 deletions hack/update-version-list.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,22 @@ function updateVersionsInIstioTypeComment() {
api/v1/istiorevision_types.go

# Ambient mode in Sail Operator is supported starting with Istio version 1.24+
# TODO: Once support for versions prior to 1.24 is discontinued, we can merge the ztunnel specific changes below with the other components.
ztunnelselectValues=$(yq '.versions[] | select(.version >= "1.24.0" or .ref >= "v1.24.0") | ", \"urn:alm:descriptor:com.tectonic.ui:select:" + .name + "\""' "${VERSIONS_YAML_PATH}" | tr -d '\n')
ztunnelversionsEnum=$(yq '.versions[] | select(.version >= "1.24.0" or .ref >= "v1.24.0") | .name' "${VERSIONS_YAML_PATH}" | tr '\n' ';' | sed 's/;$//g')
ztunnelversions=$(yq '.versions[] | select(.version >= "1.24.0" or .ref >= "v1.24.0") | .name' "${VERSIONS_YAML_PATH}" | tr '\n' ',' | sed -e 's/,/, /g' -e 's/, $//g')
# Filter out versions prior to 1.24 from the versionsEnum by removing v1.21.x, v1.22.x, v1.23.x entries
ztunnelversionsEnum=$(echo "$versionsEnum" | sed -E 's/v1\.(21|22|23)[^;]*;?//g; s/;+/;/g; s/^;//; s/;$//')

sed -i -E \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName=\"Istio Version\",xDescriptors=\{.*fieldGroup:General\")[^}]*(})/\1$ztunnelselectValues}/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName=\"Istio Version\",xDescriptors=\{.*fieldGroup:General\")[^}]*(})/\1$selectValues}/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+kubebuilder:validation:Enum=)(.*)/\1$ztunnelversionsEnum/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+kubebuilder:default=)(.*)/\1$defaultVersion/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \Must be one of:)(.*)/\1 $ztunnelversions./g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \Must be one of:)(.*)/\1 $versions./g" \
-e "s/(\+kubebuilder:default=.*version: \")[^\"]*\"/\1$defaultVersion\"/g" \
api/v1alpha1/ztunnel_types.go

sed -i -E \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName=\"Istio Version\",xDescriptors=\{.*fieldGroup:General\")[^}]*(})/\1$ztunnelselectValues}/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName=\"Istio Version\",xDescriptors=\{.*fieldGroup:General\")[^}]*(})/\1$selectValues}/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+kubebuilder:validation:Enum=)(.*)/\1$ztunnelversionsEnum/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \+kubebuilder:default=)(.*)/\1$defaultVersion/g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \Must be one of:)(.*)/\1 $ztunnelversions./g" \
-e "/\+sail:version/,/Version string/ s/(\/\/ \Must be one of:)(.*)/\1 $versions./g" \
-e "s/(\+kubebuilder:default=.*version: \")[^\"]*\"/\1$defaultVersion\"/g" \
api/v1/ztunnel_types.go
}
Expand Down Expand Up @@ -106,7 +104,8 @@ function updateVersionInSamples() {
-e "s/version: .*/version: $defaultVersion/g" \
chart/samples/istio-sample.yaml chart/samples/istiocni-sample.yaml chart/samples/istio-sample-gw-api.yaml \
chart/samples/istio-sample-revisionbased.yaml chart/samples/ambient/istiocni-sample.yaml \
chart/samples/ambient/istio-sample.yaml chart/samples/ambient/istioztunnel-sample.yaml
chart/samples/ambient/istio-sample.yaml chart/samples/ambient/istioztunnel-sample.yaml \
chart/samples/ztunnel-sample.yaml
}

updateVersionsInIstioTypeComment
Expand Down
Loading