Bump istio to 1.22.3 (#88)

Signed-off-by: Filip Brychta <fbrychta@redhat.com>
openshift-service-mesh · Jul 17, 2024 · c682196 · c682196
1 parent 8026e52
commit c682196
Show file tree

Hide file tree

Showing 141 changed files with 149 additions and 119 deletions.
diff --git a/api/v1alpha1/istio_types.go b/api/v1alpha1/istio_types.go
@@ -37,10 +37,10 @@ const (
 type IstioSpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.22.1.
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.1"}
-	// +kubebuilder:validation:Enum=v1.22.1
-	// +kubebuilder:default=v1.22.1
+	// Must be one of: v1.22.3.
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.3"}
+	// +kubebuilder:validation:Enum=v1.22.3
+	// +kubebuilder:default=v1.22.3
 	Version string `json:"version"`
 
 	// Defines the update strategy to use when the version in the Istio CR is updated.
@@ -253,7 +253,7 @@ type Istio struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// +kubebuilder:default={version: "v1.22.1", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
+	// +kubebuilder:default={version: "v1.22.3", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
 	Spec IstioSpec `json:"spec,omitempty"`
 
 	Status IstioStatus `json:"status,omitempty"`

diff --git a/api/v1alpha1/istiocni_types.go b/api/v1alpha1/istiocni_types.go
@@ -28,10 +28,10 @@ const (
 type IstioCNISpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.22.1.
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.1"}
-	// +kubebuilder:validation:Enum=v1.22.1
-	// +kubebuilder:default=v1.22.1
+	// Must be one of: v1.22.3.
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.3"}
+	// +kubebuilder:validation:Enum=v1.22.3
+	// +kubebuilder:default=v1.22.3
 	Version string `json:"version"`
 
 	// +sail:profile
@@ -177,7 +177,7 @@ type IstioCNI struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// +kubebuilder:default={version: "v1.22.1", namespace: "istio-cni"}
+	// +kubebuilder:default={version: "v1.22.3", namespace: "istio-cni"}
 	Spec IstioCNISpec `json:"spec,omitempty"`
 
 	Status IstioCNIStatus `json:"status,omitempty"`

diff --git a/api/v1alpha1/istiorevision_types.go b/api/v1alpha1/istiorevision_types.go
@@ -30,9 +30,9 @@ const (
 type IstioRevisionSpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.22.1.
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.1"}
-	// +kubebuilder:validation:Enum=v1.22.1
+	// Must be one of: v1.22.3.
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.3"}
+	// +kubebuilder:validation:Enum=v1.22.3
 	Version string `json:"version"`
 
 	// Namespace to which the Istio components should be installed.

diff --git a/bundle/manifests/operator.istio.io_istiocnis.yaml b/bundle/manifests/operator.istio.io_istiocnis.yaml
@@ -58,7 +58,7 @@ spec:
           spec:
             default:
               namespace: istio-cni
-              version: v1.22.1
+              version: v1.22.3
             description: IstioCNISpec defines the desired state of IstioCNI
             properties:
               namespace:
@@ -1405,12 +1405,12 @@ spec:
                     type: object
                 type: object
               version:
-                default: v1.22.1
+                default: v1.22.3
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.22.1.
+                  Must be one of: v1.22.3.
                 enum:
-                - v1.22.1
+                - v1.22.3
                 type: string
             required:
             - namespace

diff --git a/bundle/manifests/operator.istio.io_istiorevisions.yaml b/bundle/manifests/operator.istio.io_istiorevisions.yaml
@@ -8056,9 +8056,9 @@ spec:
               version:
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.22.1.
+                  Must be one of: v1.22.3.
                 enum:
-                - v1.22.1
+                - v1.22.3
                 type: string
             required:
             - namespace

diff --git a/bundle/manifests/operator.istio.io_istios.yaml b/bundle/manifests/operator.istio.io_istios.yaml
@@ -76,7 +76,7 @@ spec:
               namespace: istio-system
               updateStrategy:
                 type: InPlace
-              version: v1.22.1
+              version: v1.22.3
             description: IstioSpec defines the desired state of Istio
             properties:
               namespace:
@@ -8123,12 +8123,12 @@ spec:
                     type: object
                 type: object
               version:
-                default: v1.22.1
+                default: v1.22.3
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.22.1.
+                  Must be one of: v1.22.3.
                 enum:
-                - v1.22.1
+                - v1.22.3
                 type: string
             required:
             - namespace

diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
@@ -16,7 +16,7 @@ metadata:
               "inactiveRevisionDeletionGracePeriodSeconds": 30,
               "type": "InPlace"
             },
-            "version": "v1.22.1"
+            "version": "v1.22.3"
           }
         },
         {
@@ -27,14 +27,14 @@ metadata:
           },
           "spec": {
             "namespace": "istio-cni",
-            "version": "v1.22.1"
+            "version": "v1.22.3"
           }
         }
       ]
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
     containerImage: quay.io/maistra-dev/sail-operator:3.0.0-tp-latest
-    createdAt: "2024-07-11T11:01:04Z"
+    createdAt: "2024-07-17T09:48:18Z"
     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.
@@ -162,12 +162,12 @@ spec:
       kind: IstioCNI
       name: istiocnis.operator.istio.io
       specDescriptors:
-      - description: 'Defines the version of Istio to install. Must be one of: v1.22.1.'
+      - description: 'Defines the version of Istio to install. Must be one of: v1.22.3.'
         displayName: Istio Version
         path: version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.1
+        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
       - description: Namespace to which the Istio CNI component should be installed.
         displayName: Namespace
         path: namespace
@@ -194,12 +194,12 @@ spec:
       kind: IstioRevision
       name: istiorevisions.operator.istio.io
       specDescriptors:
-      - description: 'Defines the version of Istio to install. Must be one of: v1.22.1.'
+      - description: 'Defines the version of Istio to install. Must be one of: v1.22.3.'
         displayName: Istio Version
         path: version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.1
+        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
       - description: Namespace to which the Istio components should be installed.
         displayName: Namespace
         path: namespace
@@ -234,12 +234,12 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:select:InPlace
         - urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
-      - description: 'Defines the version of Istio to install. Must be one of: v1.22.1.'
+      - description: 'Defines the version of Istio to install. Must be one of: v1.22.3.'
         displayName: Istio Version
         path: version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.1
+        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
       - description: Defines how many seconds the operator should wait before removing
           a non-active revision after all the workloads have stopped using it. You
           may want to set this value on the order of minutes. The minimum and the
@@ -476,11 +476,11 @@ spec:
           template:
             metadata:
               annotations:
-                images.v1_22_1.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.1.tp.1
-                images.v1_22_1.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
-                images.v1_22_1.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
-                images.v1_22_1.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
-                images.v1_22_1.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
+                images.v1_22_3.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.3.tp.1
+                images.v1_22_3.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
+                images.v1_22_3.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
+                images.v1_22_3.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
+                images.v1_22_3.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
                 kubectl.kubernetes.io/default-container: manager
               labels:
                 app.kubernetes.io/created-by: servicemeshoperator3

diff --git a/chart/crds/operator.istio.io_istiocnis.yaml b/chart/crds/operator.istio.io_istiocnis.yaml
@@ -58,7 +58,7 @@ spec:
           spec:
             default:
               namespace: istio-cni
-              version: v1.22.1
+              version: v1.22.3
             description: IstioCNISpec defines the desired state of IstioCNI
             properties:
               namespace:
@@ -1405,12 +1405,12 @@ spec:
                     type: object
                 type: object
               version:
-                default: v1.22.1
+                default: v1.22.3
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.22.1.
+                  Must be one of: v1.22.3.
                 enum:
-                - v1.22.1
+                - v1.22.3
                 type: string
             required:
             - namespace

diff --git a/chart/crds/operator.istio.io_istiorevisions.yaml b/chart/crds/operator.istio.io_istiorevisions.yaml
@@ -8056,9 +8056,9 @@ spec:
               version:
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.22.1.
+                  Must be one of: v1.22.3.
                 enum:
-                - v1.22.1
+                - v1.22.3
                 type: string
             required:
             - namespace

diff --git a/chart/crds/operator.istio.io_istios.yaml b/chart/crds/operator.istio.io_istios.yaml
@@ -76,7 +76,7 @@ spec:
               namespace: istio-system
               updateStrategy:
                 type: InPlace
-              version: v1.22.1
+              version: v1.22.3
             description: IstioSpec defines the desired state of Istio
             properties:
               namespace:
@@ -8123,12 +8123,12 @@ spec:
                     type: object
                 type: object
               version:
-                default: v1.22.1
+                default: v1.22.3
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.22.1.
+                  Must be one of: v1.22.3.
                 enum:
-                - v1.22.1
+                - v1.22.3
                 type: string
             required:
             - namespace

diff --git a/chart/samples/istio-sample-kubernetes.yaml b/chart/samples/istio-sample-kubernetes.yaml
@@ -3,7 +3,7 @@ kind: Istio
 metadata:
   name: default
 spec:
-  version: v1.22.1
+  version: v1.22.3
   namespace: istio-system
   updateStrategy:
     type: InPlace

diff --git a/chart/samples/istio-sample-openshift.yaml b/chart/samples/istio-sample-openshift.yaml
@@ -3,7 +3,7 @@ kind: Istio
 metadata:
   name: default
 spec:
-  version: v1.22.1
+  version: v1.22.3
   namespace: istio-system
   updateStrategy:
     type: InPlace

diff --git a/chart/samples/istiocni-sample.yaml b/chart/samples/istiocni-sample.yaml
@@ -3,5 +3,5 @@ kind: IstioCNI
 metadata:
   name: default
 spec:
-  version: v1.22.1
+  version: v1.22.3
   namespace: istio-cni
diff --git a/ossm/values.yaml b/ossm/values.yaml
@@ -2,12 +2,12 @@ name: servicemeshoperator3
 deployment:
   name: servicemesh-operator3
   annotations:
-    images.v1_22_1.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
-    images.v1_22_1.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
-    images.v1_22_1.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.1.tp.1
+    images.v1_22_3.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
+    images.v1_22_3.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
+    images.v1_22_3.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.3.tp.1
     # TODO insert ztunnel image name once we're shipping ztunnel
-    images.v1_22_1.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
-    images.v1_22_1.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
+    images.v1_22_3.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
+    images.v1_22_3.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
 service:
   port: 8443
 serviceAccountName: servicemesh-operator3

diff --git a/ossm/versions.yaml b/ossm/versions.yaml
@@ -4,19 +4,19 @@
 # versions specified below can be the source of the CRDs. Because CRDs are
 # typically backwards-compatible, the following field should point to the
 # most recent version.
-crdSourceVersion: v1.22.1
+crdSourceVersion: v1.22.3
 # The list of versions to support. Each item specifies the name of the version,
 # the Git repository and commit hash for retrieving the profiles, and
 # a list of URLs for retrieving the charts.
 # The first item in the list is the default version.
 versions:
-  - name: v1.22.1
-    version: 1.22.1
+  - name: v1.22.3
+    version: 1.22.3
     repo: https://github.com/istio/istio
-    commit: 1.22.1
+    commit: 1.22.3
     charts:
-      - https://istio-release.storage.googleapis.com/charts/base-1.22.1.tgz
-      - https://istio-release.storage.googleapis.com/charts/istiod-1.22.1.tgz
-      - https://istio-release.storage.googleapis.com/charts/gateway-1.22.1.tgz
-      - https://istio-release.storage.googleapis.com/charts/cni-1.22.1.tgz
-      - https://istio-release.storage.googleapis.com/charts/ztunnel-1.22.1.tgz
+      - https://istio-release.storage.googleapis.com/charts/base-1.22.3.tgz
+      - https://istio-release.storage.googleapis.com/charts/istiod-1.22.3.tgz
+      - https://istio-release.storage.googleapis.com/charts/gateway-1.22.3.tgz
+      - https://istio-release.storage.googleapis.com/charts/cni-1.22.3.tgz
+      - https://istio-release.storage.googleapis.com/charts/ztunnel-1.22.3.tgz
diff --git a/resources/v1.22.1/charts/ztunnel/files/profile-compatibility-version-1.20.yaml b/resources/v1.22.1/charts/ztunnel/files/profile-compatibility-version-1.20.yaml
diff --git a/resources/v1.22.1/charts/ztunnel/files/profile-compatibility-version-1.21.yaml b/resources/v1.22.1/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
diff --git a/resources/v1.22.1/charts/base/Chart.yaml → resources/v1.22.3/charts/base/Chart.yaml b/resources/v1.22.1/charts/base/Chart.yaml → resources/v1.22.3/charts/base/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
-appVersion: 1.22.1
+appVersion: 1.22.3
 description: Helm chart for deploying Istio cluster resources and CRDs
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
 - istio
 name: base
 sources:
 - https://github.com/istio/istio
-version: 1.22.1
+version: 1.22.3
diff --git a/resources/v1.22.1/charts/base/README.md → resources/v1.22.3/charts/base/README.md b/resources/v1.22.1/charts/base/README.md → resources/v1.22.3/charts/base/README.md
diff --git a/...v1.22.1/charts/base/crds/crd-all.gen.yaml → ...v1.22.3/charts/base/crds/crd-all.gen.yaml b/...v1.22.1/charts/base/crds/crd-all.gen.yaml → ...v1.22.3/charts/base/crds/crd-all.gen.yaml
diff --git a/....1/charts/base/files/profile-ambient.yaml → ....3/charts/base/files/profile-ambient.yaml b/....1/charts/base/files/profile-ambient.yaml → ....3/charts/base/files/profile-ambient.yaml