Skip to content

Commit 94b6c47

Browse files
dgnFilipB
dgn
and
FilipB
authored
Signed-off-by: Daniel Grimm <[email protected]> Co-authored-by: Filip Brychta <[email protected]>
1 parent 9bde6d6 commit 94b6c47

File tree

167 files changed

+25338
-41
lines changed

Some content is hidden

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

167 files changed

+25338
-41
lines changed

‎api/v1alpha1/istio_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ const (
3737
type IstioSpec struct {
3838
// +sail:version
3939
// Defines the version of Istio to install.
40-
// Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.6", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
42-
// +kubebuilder:validation:Enum=v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
43-
// +kubebuilder:default=v1.23.3
40+
// Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.6", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
42+
// +kubebuilder:validation:Enum=v1.24.0;v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
43+
// +kubebuilder:default=v1.24.0
4444
Version string `json:"version"`
4545

4646
// Defines the update strategy to use when the version in the Istio CR is updated.
@@ -261,7 +261,7 @@ type Istio struct {
261261
metav1.TypeMeta `json:",inline"`
262262
metav1.ObjectMeta `json:"metadata,omitempty"`
263263

264-
// +kubebuilder:default={version: "v1.23.3", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
264+
// +kubebuilder:default={version: "v1.24.0", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
265265
Spec IstioSpec `json:"spec,omitempty"`
266266

267267
Status IstioStatus `json:"status,omitempty"`

‎api/v1alpha1/istiocni_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ const (
2828
type IstioCNISpec struct {
2929
// +sail:version
3030
// Defines the version of Istio to install.
31-
// Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.6", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
33-
// +kubebuilder:validation:Enum=v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
34-
// +kubebuilder:default=v1.23.3
31+
// Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.6", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
33+
// +kubebuilder:validation:Enum=v1.24.0;v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
34+
// +kubebuilder:default=v1.24.0
3535
Version string `json:"version"`
3636

3737
// +sail:profile
@@ -177,7 +177,7 @@ type IstioCNI struct {
177177
metav1.TypeMeta `json:",inline"`
178178
metav1.ObjectMeta `json:"metadata,omitempty"`
179179

180-
// +kubebuilder:default={version: "v1.23.3", namespace: "istio-cni"}
180+
// +kubebuilder:default={version: "v1.24.0", namespace: "istio-cni"}
181181
Spec IstioCNISpec `json:"spec,omitempty"`
182182

183183
Status IstioCNIStatus `json:"status,omitempty"`

‎api/v1alpha1/istiorevision_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ const (
3030
type IstioRevisionSpec struct {
3131
// +sail:version
3232
// Defines the version of Istio to install.
33-
// Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
34-
// +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.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.6", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
35-
// +kubebuilder:validation:Enum=v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
33+
// Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
34+
// +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.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.21.6", "urn:alm:descriptor:com.tectonic.ui:select:latest"}
35+
// +kubebuilder:validation:Enum=v1.24.0;v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
3636
Version string `json:"version"`
3737

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

‎bundle/manifests/sailoperator.clusterserviceversion.yaml‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ metadata:
1616
"inactiveRevisionDeletionGracePeriodSeconds": 30,
1717
"type": "InPlace"
1818
},
19-
"version": "v1.23.3"
19+
"version": "v1.24.0"
2020
}
2121
},
2222
{
@@ -27,14 +27,14 @@ metadata:
2727
},
2828
"spec": {
2929
"namespace": "istio-cni",
30-
"version": "v1.23.3"
30+
"version": "v1.24.0"
3131
}
3232
}
3333
]
3434
capabilities: Seamless Upgrades
3535
categories: OpenShift Optional, Integration & Delivery, Networking, Security
3636
containerImage: quay.io/maistra-dev/sail-operator:0.2-latest
37-
createdAt: "2024-11-13T05:05:11Z"
37+
createdAt: "2024-11-13T00:09:46Z"
3838
description: Experimental operator for installing Istio service mesh
3939
features.operators.openshift.io/cnf: "false"
4040
features.operators.openshift.io/cni: "true"
@@ -160,11 +160,12 @@ spec:
160160
specDescriptors:
161161
- description: |-
162162
Defines the version of Istio to install.
163-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
163+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
164164
displayName: Istio Version
165165
path: version
166166
x-descriptors:
167167
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
168+
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.0
168169
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.3
169170
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.2
170171
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.6
@@ -200,11 +201,12 @@ spec:
200201
specDescriptors:
201202
- description: |-
202203
Defines the version of Istio to install.
203-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
204+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
204205
displayName: Istio Version
205206
path: version
206207
x-descriptors:
207208
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
209+
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.0
208210
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.3
209211
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.2
210212
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.6
@@ -248,11 +250,12 @@ spec:
248250
- urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
249251
- description: |-
250252
Defines the version of Istio to install.
251-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
253+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
252254
displayName: Istio Version
253255
path: version
254256
x-descriptors:
255257
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
258+
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.0
256259
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.3
257260
- urn:alm:descriptor:com.tectonic.ui:select:v1.23.2
258261
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.6
@@ -306,6 +309,7 @@ spec:
306309
307310
This version of the operator supports the following Istio versions:
308311
312+
- v1.24.0
309313
- v1.23.3
310314
- v1.23.2
311315
- v1.22.6
@@ -559,6 +563,10 @@ spec:
559563
images.v1_23_3.istiod: docker.io/istio/pilot:1.23.3
560564
images.v1_23_3.proxy: docker.io/istio/proxyv2:1.23.3
561565
images.v1_23_3.ztunnel: docker.io/istio/ztunnel:1.23.3
566+
images.v1_24_0.cni: docker.io/istio/install-cni:1.24.0
567+
images.v1_24_0.istiod: docker.io/istio/pilot:1.24.0
568+
images.v1_24_0.proxy: docker.io/istio/proxyv2:1.24.0
569+
images.v1_24_0.ztunnel: docker.io/istio/ztunnel:1.24.0
562570
kubectl.kubernetes.io/default-container: sail-operator
563571
labels:
564572
app.kubernetes.io/created-by: sailoperator
@@ -759,4 +767,12 @@ spec:
759767
name: v1_23_3.proxy
760768
- image: docker.io/istio/ztunnel:1.23.3
761769
name: v1_23_3.ztunnel
770+
- image: docker.io/istio/install-cni:1.24.0
771+
name: v1_24_0.cni
772+
- image: docker.io/istio/pilot:1.24.0
773+
name: v1_24_0.istiod
774+
- image: docker.io/istio/proxyv2:1.24.0
775+
name: v1_24_0.proxy
776+
- image: docker.io/istio/ztunnel:1.24.0
777+
name: v1_24_0.ztunnel
762778
version: 0.2.0

‎bundle/manifests/sailoperator.io_istiocnis.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
spec:
5959
default:
6060
namespace: istio-cni
61-
version: v1.23.3
61+
version: v1.24.0
6262
description: IstioCNISpec defines the desired state of IstioCNI
6363
properties:
6464
namespace:
@@ -1411,11 +1411,12 @@ spec:
14111411
type: object
14121412
type: object
14131413
version:
1414-
default: v1.23.3
1414+
default: v1.24.0
14151415
description: |-
14161416
Defines the version of Istio to install.
1417-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
1417+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
14181418
enum:
1419+
- v1.24.0
14191420
- v1.23.3
14201421
- v1.23.2
14211422
- v1.22.6

‎bundle/manifests/sailoperator.io_istiorevisions.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9389,8 +9389,9 @@ spec:
93899389
version:
93909390
description: |-
93919391
Defines the version of Istio to install.
9392-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
9392+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
93939393
enum:
9394+
- v1.24.0
93949395
- v1.23.3
93959396
- v1.23.2
93969397
- v1.22.6

‎bundle/manifests/sailoperator.io_istios.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ spec:
8080
namespace: istio-system
8181
updateStrategy:
8282
type: InPlace
83-
version: v1.23.3
83+
version: v1.24.0
8484
description: IstioSpec defines the desired state of Istio
8585
properties:
8686
namespace:
@@ -9456,11 +9456,12 @@ spec:
94569456
type: object
94579457
type: object
94589458
version:
9459-
default: v1.23.3
9459+
default: v1.24.0
94609460
description: |-
94619461
Defines the version of Istio to install.
9462-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
9462+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
94639463
enum:
9464+
- v1.24.0
94649465
- v1.23.3
94659466
- v1.23.2
94669467
- v1.22.6

‎chart/crds/sailoperator.io_istiocnis.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
spec:
5959
default:
6060
namespace: istio-cni
61-
version: v1.23.3
61+
version: v1.24.0
6262
description: IstioCNISpec defines the desired state of IstioCNI
6363
properties:
6464
namespace:
@@ -1411,11 +1411,12 @@ spec:
14111411
type: object
14121412
type: object
14131413
version:
1414-
default: v1.23.3
1414+
default: v1.24.0
14151415
description: |-
14161416
Defines the version of Istio to install.
1417-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
1417+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
14181418
enum:
1419+
- v1.24.0
14191420
- v1.23.3
14201421
- v1.23.2
14211422
- v1.22.6

‎chart/crds/sailoperator.io_istiorevisions.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9389,8 +9389,9 @@ spec:
93899389
version:
93909390
description: |-
93919391
Defines the version of Istio to install.
9392-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
9392+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
93939393
enum:
9394+
- v1.24.0
93949395
- v1.23.3
93959396
- v1.23.2
93969397
- v1.22.6

‎chart/crds/sailoperator.io_istios.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ spec:
8080
namespace: istio-system
8181
updateStrategy:
8282
type: InPlace
83-
version: v1.23.3
83+
version: v1.24.0
8484
description: IstioSpec defines the desired state of Istio
8585
properties:
8686
namespace:
@@ -9456,11 +9456,12 @@ spec:
94569456
type: object
94579457
type: object
94589458
version:
9459-
default: v1.23.3
9459+
default: v1.24.0
94609460
description: |-
94619461
Defines the version of Istio to install.
9462-
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
9462+
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
94639463
enum:
9464+
- v1.24.0
94649465
- v1.23.3
94659466
- v1.23.2
94669467
- v1.22.6

0 commit comments

Comments
 (0)