OSSM-8242: use just one istio version so we can build it in cpaas + b…

…ump (openshift-service-mesh#146) to tp2
openshift-service-mesh-bot · Oct 10, 2024 · c8c95fc · c8c95fc
1 parent 64a14b8
commit c8c95fc
Show file tree

Hide file tree

Showing 409 changed files with 78 additions and 62,864 deletions.
diff --git a/Makefile.vendor.mk b/Makefile.vendor.mk
@@ -1,7 +1,7 @@
-VERSION = 3.0.0-tp.1
+VERSION = 3.0.0-tp.2
 OPERATOR_NAME = servicemeshoperator3
 HUB = quay.io/maistra-dev
 CHANNELS = candidates
 HELM_VALUES_FILE = ossm/values.yaml
-VERSIONS_YAML_FILE = versions.yaml
+VERSIONS_YAML_FILE ?= ossm/versions.yaml
 GENERATE_RELATED_IMAGES = false
diff --git a/api/v1alpha1/istio_types.go b/api/v1alpha1/istio_types.go
@@ -37,9 +37,9 @@ const (
 type IstioSpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
-	// +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.23.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.5", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
-	// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
+	// Must be one of: v1.23.0.
+	// +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.23.0"}
+	// +kubebuilder:validation:Enum=v1.23.0
 	// +kubebuilder:default=v1.23.0
 	Version string `json:"version"`
 
@@ -51,10 +51,10 @@ type IstioSpec struct {
 	// +sail:profile
 	// The built-in installation configuration profile to use.
 	// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-	// Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+	// Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
 	// +++PROFILES-DROPDOWN-HIDDEN-UNTIL-WE-FULLY-IMPLEMENT-THEM+++operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Profile",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:ambient", "urn:alm:descriptor:com.tectonic.ui:select:default", "urn:alm:descriptor:com.tectonic.ui:select:demo", "urn:alm:descriptor:com.tectonic.ui:select:empty", "urn:alm:descriptor:com.tectonic.ui:select:external", "urn:alm:descriptor:com.tectonic.ui:select:minimal", "urn:alm:descriptor:com.tectonic.ui:select:preview", "urn:alm:descriptor:com.tectonic.ui:select:remote"}
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
-	// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;openshift-ambient;openshift;preview;stable
+	// +kubebuilder:validation:Enum=ambient;default;demo;empty;openshift-ambient;openshift;preview;stable
 	Profile string `json:"profile,omitempty"`
 
 	// Namespace to which the Istio components should be installed.

diff --git a/api/v1alpha1/istiocni_types.go b/api/v1alpha1/istiocni_types.go
@@ -28,19 +28,19 @@ const (
 type IstioCNISpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
-	// +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.23.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.5", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
-	// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
+	// Must be one of: v1.23.0.
+	// +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.23.0"}
+	// +kubebuilder:validation:Enum=v1.23.0
 	// +kubebuilder:default=v1.23.0
 	Version string `json:"version"`
 
 	// +sail:profile
 	// The built-in installation configuration profile to use.
 	// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-	// Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+	// Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
 	// +++PROFILES-DROPDOWN-HIDDEN-UNTIL-WE-FULLY-IMPLEMENT-THEM+++operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Profile",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:ambient", "urn:alm:descriptor:com.tectonic.ui:select:default", "urn:alm:descriptor:com.tectonic.ui:select:demo", "urn:alm:descriptor:com.tectonic.ui:select:empty", "urn:alm:descriptor:com.tectonic.ui:select:external", "urn:alm:descriptor:com.tectonic.ui:select:minimal", "urn:alm:descriptor:com.tectonic.ui:select:preview", "urn:alm:descriptor:com.tectonic.ui:select:remote"}
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
-	// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;openshift-ambient;openshift;preview;stable
+	// +kubebuilder:validation:Enum=ambient;default;demo;empty;openshift-ambient;openshift;preview;stable
 	Profile string `json:"profile,omitempty"`
 
 	// Namespace to which the Istio CNI component should be installed.

diff --git a/api/v1alpha1/istiorevision_types.go b/api/v1alpha1/istiorevision_types.go
@@ -35,9 +35,9 @@ type IstioRevisionSpec struct {
 
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
-	// +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.23.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.5", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
-	// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
+	// Must be one of: v1.23.0.
+	// +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.23.0"}
+	// +kubebuilder:validation:Enum=v1.23.0
 	Version string `json:"version"`
 
 	// Namespace to which the Istio components should be installed.

diff --git a/api/v1alpha1/remoteistio_types.go b/api/v1alpha1/remoteistio_types.go
@@ -27,9 +27,9 @@ const RemoteIstioKind = "RemoteIstio"
 type RemoteIstioSpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
-	// +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.23.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.5", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
-	// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
+	// Must be one of: v1.23.0.
+	// +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.23.0"}
+	// +kubebuilder:validation:Enum=v1.23.0
 	// +kubebuilder:default=v1.23.0
 	Version string `json:"version"`
 
@@ -41,10 +41,10 @@ type RemoteIstioSpec struct {
 	// +sail:profile
 	// The built-in installation configuration profile to use.
 	// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-	// Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+	// Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
 	// +++PROFILES-DROPDOWN-HIDDEN-UNTIL-WE-FULLY-IMPLEMENT-THEM+++operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Profile",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:ambient", "urn:alm:descriptor:com.tectonic.ui:select:default", "urn:alm:descriptor:com.tectonic.ui:select:demo", "urn:alm:descriptor:com.tectonic.ui:select:empty", "urn:alm:descriptor:com.tectonic.ui:select:external", "urn:alm:descriptor:com.tectonic.ui:select:minimal", "urn:alm:descriptor:com.tectonic.ui:select:preview", "urn:alm:descriptor:com.tectonic.ui:select:remote"}
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
-	// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;openshift-ambient;openshift;preview;stable
+	// +kubebuilder:validation:Enum=ambient;default;demo;empty;openshift-ambient;openshift;preview;stable
 	Profile string `json:"profile,omitempty"`
 
 	// Namespace to which the Istio components should be installed.

diff --git a/bundle/manifests/sailoperator.io_istiocnis.yaml b/bundle/manifests/sailoperator.io_istiocnis.yaml
@@ -70,13 +70,12 @@ spec:
                 description: |-
                   The built-in installation configuration profile to use.
                   The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-                  Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+                  Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
                 enum:
                 - ambient
                 - default
                 - demo
                 - empty
-                - external
                 - openshift-ambient
                 - openshift
                 - preview
@@ -1395,12 +1394,9 @@ spec:
                 default: v1.23.0
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+                  Must be one of: v1.23.0.
                 enum:
                 - v1.23.0
-                - v1.22.3
-                - v1.21.5
-                - latest
                 type: string
             required:
             - namespace

diff --git a/bundle/manifests/sailoperator.io_istiorevisions.yaml b/bundle/manifests/sailoperator.io_istiorevisions.yaml
@@ -7927,12 +7927,9 @@ spec:
               version:
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+                  Must be one of: v1.23.0.
                 enum:
                 - v1.23.0
-                - v1.22.3
-                - v1.21.5
-                - latest
                 type: string
             required:
             - namespace

diff --git a/bundle/manifests/sailoperator.io_istios.yaml b/bundle/manifests/sailoperator.io_istios.yaml
@@ -87,13 +87,12 @@ spec:
                 description: |-
                   The built-in installation configuration profile to use.
                   The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-                  Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+                  Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
                 enum:
                 - ambient
                 - default
                 - demo
                 - empty
-                - external
                 - openshift-ambient
                 - openshift
                 - preview
@@ -7983,12 +7982,9 @@ spec:
                 default: v1.23.0
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+                  Must be one of: v1.23.0.
                 enum:
                 - v1.23.0
-                - v1.22.3
-                - v1.21.5
-                - latest
                 type: string
             required:
             - namespace

diff --git a/bundle/manifests/sailoperator.io_remoteistios.yaml b/bundle/manifests/sailoperator.io_remoteistios.yaml
@@ -82,13 +82,12 @@ spec:
                 description: |-
                   The built-in installation configuration profile to use.
                   The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-                  Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+                  Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
                 enum:
                 - ambient
                 - default
                 - demo
                 - empty
-                - external
                 - openshift-ambient
                 - openshift
                 - preview
@@ -7978,12 +7977,9 @@ spec:
                 default: v1.23.0
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+                  Must be one of: v1.23.0.
                 enum:
                 - v1.23.0
-                - v1.22.3
-                - v1.21.5
-                - latest
                 type: string
             required:
             - namespace

diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
@@ -34,7 +34,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
     containerImage: quay.io/maistra-dev/sail-operator:3.0-latest
-    createdAt: "2024-08-29T15:46:07Z"
+    createdAt: "2024-10-10T07:52:12Z"
     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.
@@ -55,7 +55,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/istio-ecosystem/sail-operator
     support: Red Hat, Inc.
-  name: servicemeshoperator3.v3.0.0-tp.1
+  name: servicemeshoperator3.v3.0.0-tp.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -164,15 +164,12 @@ spec:
       specDescriptors:
       - description: |-
           Defines the version of Istio to install.
-          Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+          Must be one of: v1.23.0.
         displayName: Istio Version
         path: version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
         - urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
-        - urn:alm:descriptor:com.tectonic.ui:select:latest
       - description: Namespace to which the Istio CNI component should be installed.
         displayName: Namespace
         path: namespace
@@ -181,7 +178,7 @@ spec:
       - description: |-
           The built-in installation configuration profile to use.
           The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-          Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+          Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
         displayName: Profile
         path: profile
         x-descriptors:
@@ -202,15 +199,12 @@ spec:
       specDescriptors:
       - description: |-
           Defines the version of Istio to install.
-          Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+          Must be one of: v1.23.0.
         displayName: Istio Version
         path: version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
         - urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
-        - urn:alm:descriptor:com.tectonic.ui:select:latest
       - description: Namespace to which the Istio components should be installed.
         displayName: Namespace
         path: namespace
@@ -248,15 +242,12 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
       - description: |-
           Defines the version of Istio to install.
-          Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+          Must be one of: v1.23.0.
         displayName: Istio Version
         path: version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
         - urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
-        - urn:alm:descriptor:com.tectonic.ui:select:latest
       - 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.
@@ -284,7 +275,7 @@ spec:
       - description: |-
           The built-in installation configuration profile to use.
           The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-          Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+          Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
         displayName: Profile
         path: profile
         x-descriptors:
@@ -320,15 +311,12 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
       - description: |-
           Defines the version of Istio to install.
-          Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+          Must be one of: v1.23.0.
         displayName: Istio Version
         path: version
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
         - urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
-        - urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
-        - urn:alm:descriptor:com.tectonic.ui:select:latest
       - 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.
@@ -356,7 +344,7 @@ spec:
       - description: |-
           The built-in installation configuration profile to use.
           The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-          Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+          Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
         displayName: Profile
         path: profile
         x-descriptors:
@@ -784,4 +772,4 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat, Inc.
-  version: 3.0.0-tp.1
+  version: 3.0.0-tp.2
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: sail-operator
 description: A Helm chart for Kubernetes
 type: application
-version: 3.0.0-tp.1
-appVersion: "3.0.0-tp.1"
+version: 3.0.0-tp.2
+appVersion: "3.0.0-tp.2"
diff --git a/chart/crds/sailoperator.io_istiocnis.yaml b/chart/crds/sailoperator.io_istiocnis.yaml
@@ -70,13 +70,12 @@ spec:
                 description: |-
                   The built-in installation configuration profile to use.
                   The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
-                  Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
+                  Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
                 enum:
                 - ambient
                 - default
                 - demo
                 - empty
-                - external
                 - openshift-ambient
                 - openshift
                 - preview
@@ -1395,12 +1394,9 @@ spec:
                 default: v1.23.0
                 description: |-
                   Defines the version of Istio to install.
-                  Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
+                  Must be one of: v1.23.0.
                 enum:
                 - v1.23.0
-                - v1.22.3
-                - v1.21.5
-                - latest
                 type: string
             required:
             - namespace