Skip to content

Commit 0bf22ab

Browse files
FilipBFilipB
authored
Bump istio to 1.24.2 and switch from tp release to ga (openshift-service-mesh#184)
This should also fix the openshift-service-mesh-sail-operator-main-sync-upstream job
1 parent e53c4c3 commit 0bf22ab

File tree

234 files changed

+4753
-3937
lines changed

Some content is hidden

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

234 files changed

+4753
-3937
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
bundle_channels:
1010
description: "Bundle channels"
1111
required: true
12-
default: candidates
12+
default: stable
1313
is_draft_release:
1414
description: "Draft release"
1515
type: boolean

‎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.2
1+
VERSION = 3.0.0
22
OPERATOR_NAME = servicemeshoperator3
33
HUB = quay.io/maistra-dev
4-
CHANNELS = candidates
4+
CHANNELS = stable
55
HELM_VALUES_FILE = ossm/values.yaml
66
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,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.2.
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.2"}
42-
// +kubebuilder:validation:Enum=v1.23.2
43-
// +kubebuilder:default=v1.23.2
40+
// Must be one of: v1.24.2.
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.2"}
42+
// +kubebuilder:validation:Enum=v1.24.2
43+
// +kubebuilder:default=v1.24.2
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.2", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
264+
// +kubebuilder:default={version: "v1.24.2", 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.2.
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.2"}
33-
// +kubebuilder:validation:Enum=v1.23.2
34-
// +kubebuilder:default=v1.23.2
31+
// Must be one of: v1.24.2.
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.2"}
33+
// +kubebuilder:validation:Enum=v1.24.2
34+
// +kubebuilder:default=v1.24.2
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.2", namespace: "istio-cni"}
180+
// +kubebuilder:default={version: "v1.24.2", 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.2.
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.2"}
35-
// +kubebuilder:validation:Enum=v1.23.2
33+
// Must be one of: v1.24.2.
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.2"}
35+
// +kubebuilder:validation:Enum=v1.24.2
3636
Version string `json:"version"`
3737

3838
// 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,10 +27,10 @@ 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.2.
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.2"}
32-
// +kubebuilder:validation:Enum=v1.23.2
33-
// +kubebuilder:default=v1.23.2
30+
// Must be one of: v1.24.2.
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.24.2"}
32+
// +kubebuilder:validation:Enum=v1.24.2
33+
// +kubebuilder:default=v1.24.2
3434
Version string `json:"version"`
3535

3636
// Defines the update strategy to use when the version in the RemoteIstio CR is updated.
@@ -197,7 +197,7 @@ type RemoteIstio struct {
197197
metav1.TypeMeta `json:",inline"`
198198
metav1.ObjectMeta `json:"metadata,omitempty"`
199199

200-
// +kubebuilder:default={version: "v1.23.2", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
200+
// +kubebuilder:default={version: "v1.24.2", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
201201
Spec RemoteIstioSpec `json:"spec,omitempty"`
202202

203203
Status RemoteIstioStatus `json:"status,omitempty"`

‎bundle.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
55
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=servicemeshoperator3
8-
LABEL operators.operatorframework.io.bundle.channels.v1="candidates"
8+
LABEL operators.operatorframework.io.bundle.channels.v1="stable"
99
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

‎bundle/manifests/sailoperator.io_istiocnis.yaml‎

Lines changed: 4 additions & 4 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.2
61+
version: v1.24.2
6262
description: IstioCNISpec defines the desired state of IstioCNI
6363
properties:
6464
namespace:
@@ -1410,12 +1410,12 @@ spec:
14101410
type: object
14111411
type: object
14121412
version:
1413-
default: v1.23.2
1413+
default: v1.24.2
14141414
description: |-
14151415
Defines the version of Istio to install.
1416-
Must be one of: v1.23.2.
1416+
Must be one of: v1.24.2.
14171417
enum:
1418-
- v1.23.2
1418+
- v1.24.2
14191419
type: string
14201420
required:
14211421
- namespace

‎bundle/manifests/sailoperator.io_istiorevisions.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9396,9 +9396,9 @@ spec:
93969396
version:
93979397
description: |-
93989398
Defines the version of Istio to install.
9399-
Must be one of: v1.23.2.
9399+
Must be one of: v1.24.2.
94009400
enum:
9401-
- v1.23.2
9401+
- v1.24.2
94029402
type: string
94039403
required:
94049404
- namespace

‎bundle/manifests/sailoperator.io_istios.yaml‎

Lines changed: 4 additions & 4 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.2
83+
version: v1.24.2
8484
description: IstioSpec defines the desired state of Istio
8585
properties:
8686
namespace:
@@ -9462,12 +9462,12 @@ spec:
94629462
type: object
94639463
type: object
94649464
version:
9465-
default: v1.23.2
9465+
default: v1.24.2
94669466
description: |-
94679467
Defines the version of Istio to install.
9468-
Must be one of: v1.23.2.
9468+
Must be one of: v1.24.2.
94699469
enum:
9470-
- v1.23.2
9470+
- v1.24.2
94719471
type: string
94729472
required:
94739473
- namespace

0 commit comments

Comments
 (0)