Skip to content

Commit c8c95fc

Browse files
FilipBFilipB
authored
OSSM-8242: use just one istio version so we can build it in cpaas + bump (openshift-service-mesh#146)
to tp2
1 parent 64a14b8 commit c8c95fc

File tree

409 files changed

+78
-62864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+78
-62864
lines changed

‎Makefile.vendor.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
VERSION = 3.0.0-tp.1
1+
VERSION = 3.0.0-tp.2
22
OPERATOR_NAME = servicemeshoperator3
33
HUB = quay.io/maistra-dev
44
CHANNELS = candidates
55
HELM_VALUES_FILE = ossm/values.yaml
6-
VERSIONS_YAML_FILE = versions.yaml
6+
VERSIONS_YAML_FILE ?= ossm/versions.yaml
77
GENERATE_RELATED_IMAGES = false

‎api/v1alpha1/istio_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ const (
3737
type IstioSpec struct {
3838
// +sail:version
3939
// Defines the version of Istio to install.
40-
// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
41-
// +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"}
42-
// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
40+
// Must be one of: v1.23.0.
41+
// +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"}
42+
// +kubebuilder:validation:Enum=v1.23.0
4343
// +kubebuilder:default=v1.23.0
4444
Version string `json:"version"`
4545

@@ -51,10 +51,10 @@ type IstioSpec struct {
5151
// +sail:profile
5252
// The built-in installation configuration profile to use.
5353
// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
54-
// Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
54+
// Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
5555
// +++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"}
5656
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
57-
// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;openshift-ambient;openshift;preview;stable
57+
// +kubebuilder:validation:Enum=ambient;default;demo;empty;openshift-ambient;openshift;preview;stable
5858
Profile string `json:"profile,omitempty"`
5959

6060
// Namespace to which the Istio components should be installed.

‎api/v1alpha1/istiocni_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ const (
2828
type IstioCNISpec struct {
2929
// +sail:version
3030
// Defines the version of Istio to install.
31-
// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
32-
// +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"}
33-
// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
31+
// Must be one of: v1.23.0.
32+
// +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"}
33+
// +kubebuilder:validation:Enum=v1.23.0
3434
// +kubebuilder:default=v1.23.0
3535
Version string `json:"version"`
3636

3737
// +sail:profile
3838
// The built-in installation configuration profile to use.
3939
// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
40-
// Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
40+
// Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
4141
// +++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"}
4242
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
43-
// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;openshift-ambient;openshift;preview;stable
43+
// +kubebuilder:validation:Enum=ambient;default;demo;empty;openshift-ambient;openshift;preview;stable
4444
Profile string `json:"profile,omitempty"`
4545

4646
// Namespace to which the Istio CNI component should be installed.

‎api/v1alpha1/istiorevision_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ type IstioRevisionSpec struct {
3535

3636
// +sail:version
3737
// Defines the version of Istio to install.
38-
// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
39-
// +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"}
40-
// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
38+
// Must be one of: v1.23.0.
39+
// +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"}
40+
// +kubebuilder:validation:Enum=v1.23.0
4141
Version string `json:"version"`
4242

4343
// Namespace to which the Istio components should be installed.

‎api/v1alpha1/remoteistio_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ const RemoteIstioKind = "RemoteIstio"
2727
type RemoteIstioSpec struct {
2828
// +sail:version
2929
// Defines the version of Istio to install.
30-
// Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
31-
// +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"}
32-
// +kubebuilder:validation:Enum=v1.23.0;v1.22.3;v1.21.5;latest
30+
// Must be one of: v1.23.0.
31+
// +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"}
32+
// +kubebuilder:validation:Enum=v1.23.0
3333
// +kubebuilder:default=v1.23.0
3434
Version string `json:"version"`
3535

@@ -41,10 +41,10 @@ type RemoteIstioSpec struct {
4141
// +sail:profile
4242
// The built-in installation configuration profile to use.
4343
// The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
44-
// Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
44+
// Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
4545
// +++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"}
4646
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
47-
// +kubebuilder:validation:Enum=ambient;default;demo;empty;external;openshift-ambient;openshift;preview;stable
47+
// +kubebuilder:validation:Enum=ambient;default;demo;empty;openshift-ambient;openshift;preview;stable
4848
Profile string `json:"profile,omitempty"`
4949

5050
// Namespace to which the Istio components should be installed.

‎bundle/manifests/sailoperator.io_istiocnis.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ spec:
7070
description: |-
7171
The built-in installation configuration profile to use.
7272
The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
73-
Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
73+
Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
7474
enum:
7575
- ambient
7676
- default
7777
- demo
7878
- empty
79-
- external
8079
- openshift-ambient
8180
- openshift
8281
- preview
@@ -1395,12 +1394,9 @@ spec:
13951394
default: v1.23.0
13961395
description: |-
13971396
Defines the version of Istio to install.
1398-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
1397+
Must be one of: v1.23.0.
13991398
enum:
14001399
- v1.23.0
1401-
- v1.22.3
1402-
- v1.21.5
1403-
- latest
14041400
type: string
14051401
required:
14061402
- namespace

‎bundle/manifests/sailoperator.io_istiorevisions.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7927,12 +7927,9 @@ spec:
79277927
version:
79287928
description: |-
79297929
Defines the version of Istio to install.
7930-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
7930+
Must be one of: v1.23.0.
79317931
enum:
79327932
- v1.23.0
7933-
- v1.22.3
7934-
- v1.21.5
7935-
- latest
79367933
type: string
79377934
required:
79387935
- namespace

‎bundle/manifests/sailoperator.io_istios.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,12 @@ spec:
8787
description: |-
8888
The built-in installation configuration profile to use.
8989
The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
90-
Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
90+
Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
9191
enum:
9292
- ambient
9393
- default
9494
- demo
9595
- empty
96-
- external
9796
- openshift-ambient
9897
- openshift
9998
- preview
@@ -7983,12 +7982,9 @@ spec:
79837982
default: v1.23.0
79847983
description: |-
79857984
Defines the version of Istio to install.
7986-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
7985+
Must be one of: v1.23.0.
79877986
enum:
79887987
- v1.23.0
7989-
- v1.22.3
7990-
- v1.21.5
7991-
- latest
79927988
type: string
79937989
required:
79947990
- namespace

‎bundle/manifests/sailoperator.io_remoteistios.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,12 @@ spec:
8282
description: |-
8383
The built-in installation configuration profile to use.
8484
The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
85-
Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
85+
Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
8686
enum:
8787
- ambient
8888
- default
8989
- demo
9090
- empty
91-
- external
9291
- openshift-ambient
9392
- openshift
9493
- preview
@@ -7978,12 +7977,9 @@ spec:
79787977
default: v1.23.0
79797978
description: |-
79807979
Defines the version of Istio to install.
7981-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
7980+
Must be one of: v1.23.0.
79827981
enum:
79837982
- v1.23.0
7984-
- v1.22.3
7985-
- v1.21.5
7986-
- latest
79877983
type: string
79887984
required:
79897985
- namespace

‎bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ metadata:
3434
capabilities: Seamless Upgrades
3535
categories: OpenShift Optional, Integration & Delivery, Networking, Security
3636
containerImage: quay.io/maistra-dev/sail-operator:3.0-latest
37-
createdAt: "2024-08-29T15:46:07Z"
37+
createdAt: "2024-10-10T07:52:12Z"
3838
description: The OpenShift Service Mesh Operator enables you to install, configure,
3939
and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service
4040
Mesh is based on the open source Istio project.
@@ -55,7 +55,7 @@ metadata:
5555
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
5656
repository: https://github.com/istio-ecosystem/sail-operator
5757
support: Red Hat, Inc.
58-
name: servicemeshoperator3.v3.0.0-tp.1
58+
name: servicemeshoperator3.v3.0.0-tp.2
5959
namespace: placeholder
6060
spec:
6161
apiservicedefinitions: {}
@@ -164,15 +164,12 @@ spec:
164164
specDescriptors:
165165
- description: |-
166166
Defines the version of Istio to install.
167-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
167+
Must be one of: v1.23.0.
168168
displayName: Istio Version
169169
path: version
170170
x-descriptors:
171171
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
172172
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
173-
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
174-
- urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
175-
- urn:alm:descriptor:com.tectonic.ui:select:latest
176173
- description: Namespace to which the Istio CNI component should be installed.
177174
displayName: Namespace
178175
path: namespace
@@ -181,7 +178,7 @@ spec:
181178
- description: |-
182179
The built-in installation configuration profile to use.
183180
The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
184-
Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
181+
Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
185182
displayName: Profile
186183
path: profile
187184
x-descriptors:
@@ -202,15 +199,12 @@ spec:
202199
specDescriptors:
203200
- description: |-
204201
Defines the version of Istio to install.
205-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
202+
Must be one of: v1.23.0.
206203
displayName: Istio Version
207204
path: version
208205
x-descriptors:
209206
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
210207
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
211-
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
212-
- urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
213-
- urn:alm:descriptor:com.tectonic.ui:select:latest
214208
- description: Namespace to which the Istio components should be installed.
215209
displayName: Namespace
216210
path: namespace
@@ -248,15 +242,12 @@ spec:
248242
- urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
249243
- description: |-
250244
Defines the version of Istio to install.
251-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
245+
Must be one of: v1.23.0.
252246
displayName: Istio Version
253247
path: version
254248
x-descriptors:
255249
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
256250
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
257-
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
258-
- urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
259-
- urn:alm:descriptor:com.tectonic.ui:select:latest
260251
- description: |-
261252
Defines how many seconds the operator should wait before removing a non-active revision after all
262253
the workloads have stopped using it. You may want to set this value on the order of minutes.
@@ -284,7 +275,7 @@ spec:
284275
- description: |-
285276
The built-in installation configuration profile to use.
286277
The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
287-
Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
278+
Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
288279
displayName: Profile
289280
path: profile
290281
x-descriptors:
@@ -320,15 +311,12 @@ spec:
320311
- urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
321312
- description: |-
322313
Defines the version of Istio to install.
323-
Must be one of: v1.23.0, v1.22.3, v1.21.5, latest.
314+
Must be one of: v1.23.0.
324315
displayName: Istio Version
325316
path: version
326317
x-descriptors:
327318
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
328319
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.0
329-
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
330-
- urn:alm:descriptor:com.tectonic.ui:select:v1.21.5
331-
- urn:alm:descriptor:com.tectonic.ui:select:latest
332320
- description: |-
333321
Defines how many seconds the operator should wait before removing a non-active revision after all
334322
the workloads have stopped using it. You may want to set this value on the order of minutes.
@@ -356,7 +344,7 @@ spec:
356344
- description: |-
357345
The built-in installation configuration profile to use.
358346
The 'default' profile is always applied. On OpenShift, the 'openshift' profile is also applied on top of 'default'.
359-
Must be one of: ambient, default, demo, empty, external, openshift-ambient, openshift, preview, stable.
347+
Must be one of: ambient, default, demo, empty, openshift-ambient, openshift, preview, stable.
360348
displayName: Profile
361349
path: profile
362350
x-descriptors:
@@ -784,4 +772,4 @@ spec:
784772
maturity: alpha
785773
provider:
786774
name: Red Hat, Inc.
787-
version: 3.0.0-tp.1
775+
version: 3.0.0-tp.2

0 commit comments

Comments
 (0)