Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 1.24.0 #474

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Add 1.24.0 #474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06245bb
Add 1.24.0
dgn Nov 13, 2024
d31a7ae
Merge branch 'main' into add-1.24
FilipB Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions api/v1alpha1/istio_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ const (
type IstioSpec struct {
// +sail:version
// Defines the version of Istio to install.
// Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.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"}
// +kubebuilder:validation:Enum=v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
// +kubebuilder:default=v1.23.3
// Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.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"}
// +kubebuilder:validation:Enum=v1.24.0;v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
// +kubebuilder:default=v1.24.0
Version string `json:"version"`

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

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

Status IstioStatus `json:"status,omitempty"`
Expand Down
10 changes: 5 additions & 5 deletions api/v1alpha1/istiocni_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ const (
type IstioCNISpec struct {
// +sail:version
// Defines the version of Istio to install.
// Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.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"}
// +kubebuilder:validation:Enum=v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
// +kubebuilder:default=v1.23.3
// Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.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"}
// +kubebuilder:validation:Enum=v1.24.0;v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
// +kubebuilder:default=v1.24.0
Version string `json:"version"`

// +sail:profile
Expand Down Expand Up @@ -177,7 +177,7 @@ type IstioCNI struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

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

Status IstioCNIStatus `json:"status,omitempty"`
Expand Down
6 changes: 3 additions & 3 deletions api/v1alpha1/istiorevision_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const (
type IstioRevisionSpec struct {
// +sail:version
// Defines the version of Istio to install.
// Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.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"}
// +kubebuilder:validation:Enum=v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
// Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, 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.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"}
// +kubebuilder:validation:Enum=v1.24.0;v1.23.3;v1.23.2;v1.22.6;v1.22.5;v1.21.6;latest
Version string `json:"version"`

// Namespace to which the Istio components should be installed.
Expand Down
46 changes: 31 additions & 15 deletions bundle/manifests/sailoperator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
"inactiveRevisionDeletionGracePeriodSeconds": 30,
"type": "InPlace"
},
"version": "v1.23.3"
"version": "v1.24.0"
}
},
{
Expand All @@ -27,14 +27,14 @@ metadata:
},
"spec": {
"namespace": "istio-cni",
"version": "v1.23.3"
"version": "v1.24.0"
}
}
]
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: quay.io/maistra-dev/sail-operator:0.2-latest
createdAt: "2024-11-12T12:00:34Z"
createdAt: "2024-11-13T00:09:46Z"
description: Experimental operator for installing Istio service mesh
features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "true"
Expand Down Expand Up @@ -160,11 +160,12 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
displayName: Istio Version
path: version
x-descriptors:
- 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
Expand Down Expand Up @@ -200,11 +201,12 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
displayName: Istio Version
path: version
x-descriptors:
- 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
Expand Down Expand Up @@ -248,11 +250,12 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
- description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
displayName: Istio Version
path: version
x-descriptors:
- 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
Expand Down Expand Up @@ -306,12 +309,13 @@ spec:

This version of the operator supports the following Istio versions:

- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
- v1.22.5
- v1.21.6
- latest (b1ee384c)
- latest (56697886)

[See this page](https://github.com/istio-ecosystem/sail-operator/blob/main/bundle/README.md) for instructions on how to use it.
displayName: Sail Operator
Expand Down Expand Up @@ -535,10 +539,10 @@ spec:
template:
metadata:
annotations:
images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
images.latest.cni: gcr.io/istio-testing/install-cni:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
images.latest.istiod: gcr.io/istio-testing/pilot:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
images.latest.proxy: gcr.io/istio-testing/proxyv2:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
images.latest.ztunnel: gcr.io/istio-testing/ztunnel:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
images.v1_21_6.cni: docker.io/istio/install-cni:1.21.6
images.v1_21_6.istiod: docker.io/istio/pilot:1.21.6
images.v1_21_6.proxy: docker.io/istio/proxyv2:1.21.6
Expand All @@ -559,6 +563,10 @@ spec:
images.v1_23_3.istiod: docker.io/istio/pilot:1.23.3
images.v1_23_3.proxy: docker.io/istio/proxyv2:1.23.3
images.v1_23_3.ztunnel: docker.io/istio/ztunnel:1.23.3
images.v1_24_0.cni: docker.io/istio/install-cni:1.24.0
images.v1_24_0.istiod: docker.io/istio/pilot:1.24.0
images.v1_24_0.proxy: docker.io/istio/proxyv2:1.24.0
images.v1_24_0.ztunnel: docker.io/istio/ztunnel:1.24.0
kubectl.kubernetes.io/default-container: sail-operator
labels:
app.kubernetes.io/created-by: sailoperator
Expand Down Expand Up @@ -711,13 +719,13 @@ spec:
provider:
name: Red Hat, Inc.
relatedImages:
- image: gcr.io/istio-testing/install-cni:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
- image: gcr.io/istio-testing/install-cni:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
name: latest.cni
- image: gcr.io/istio-testing/pilot:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
- image: gcr.io/istio-testing/pilot:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
name: latest.istiod
- image: gcr.io/istio-testing/proxyv2:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
- image: gcr.io/istio-testing/proxyv2:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
name: latest.proxy
- image: gcr.io/istio-testing/ztunnel:1.25-alpha.b1ee384c11f0c7da78ccc9f206c0f6f55ded4f3e
- image: gcr.io/istio-testing/ztunnel:1.25-alpha.566978861e4b7cd7f8f855f15280ede0b05af93a
name: latest.ztunnel
- image: docker.io/istio/install-cni:1.21.6
name: v1_21_6.cni
Expand Down Expand Up @@ -759,4 +767,12 @@ spec:
name: v1_23_3.proxy
- image: docker.io/istio/ztunnel:1.23.3
name: v1_23_3.ztunnel
- image: docker.io/istio/install-cni:1.24.0
name: v1_24_0.cni
- image: docker.io/istio/pilot:1.24.0
name: v1_24_0.istiod
- image: docker.io/istio/proxyv2:1.24.0
name: v1_24_0.proxy
- image: docker.io/istio/ztunnel:1.24.0
name: v1_24_0.ztunnel
version: 0.2.0
7 changes: 4 additions & 3 deletions bundle/manifests/sailoperator.io_istiocnis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
spec:
default:
namespace: istio-cni
version: v1.23.3
version: v1.24.0
description: IstioCNISpec defines the desired state of IstioCNI
properties:
namespace:
Expand Down Expand Up @@ -1411,11 +1411,12 @@ spec:
type: object
type: object
version:
default: v1.23.3
default: v1.24.0
description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
enum:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down
3 changes: 2 additions & 1 deletion bundle/manifests/sailoperator.io_istiorevisions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9389,8 +9389,9 @@ spec:
version:
description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
enum:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down
7 changes: 4 additions & 3 deletions bundle/manifests/sailoperator.io_istios.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
namespace: istio-system
updateStrategy:
type: InPlace
version: v1.23.3
version: v1.24.0
description: IstioSpec defines the desired state of Istio
properties:
namespace:
Expand Down Expand Up @@ -9456,11 +9456,12 @@ spec:
type: object
type: object
version:
default: v1.23.3
default: v1.24.0
description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
enum:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down
7 changes: 4 additions & 3 deletions chart/crds/sailoperator.io_istiocnis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
spec:
default:
namespace: istio-cni
version: v1.23.3
version: v1.24.0
description: IstioCNISpec defines the desired state of IstioCNI
properties:
namespace:
Expand Down Expand Up @@ -1411,11 +1411,12 @@ spec:
type: object
type: object
version:
default: v1.23.3
default: v1.24.0
description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
enum:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down
3 changes: 2 additions & 1 deletion chart/crds/sailoperator.io_istiorevisions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9389,8 +9389,9 @@ spec:
version:
description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
enum:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down
7 changes: 4 additions & 3 deletions chart/crds/sailoperator.io_istios.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
namespace: istio-system
updateStrategy:
type: InPlace
version: v1.23.3
version: v1.24.0
description: IstioSpec defines the desired state of Istio
properties:
namespace:
Expand Down Expand Up @@ -9456,11 +9456,12 @@ spec:
type: object
type: object
version:
default: v1.23.3
default: v1.24.0
description: |-
Defines the version of Istio to install.
Must be one of: v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
Must be one of: v1.24.0, v1.23.3, v1.23.2, v1.22.6, v1.22.5, v1.21.6, latest.
enum:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/istio-sample-kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Istio
metadata:
name: default
spec:
version: v1.23.3
version: v1.24.0
namespace: istio-system
updateStrategy:
type: InPlace
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/istio-sample-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Istio
metadata:
name: default
spec:
version: v1.23.3
version: v1.24.0
namespace: istio-system
updateStrategy:
type: InPlace
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/istiocni-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ kind: IstioCNI
metadata:
name: default
spec:
version: v1.23.3
version: v1.24.0
namespace: istio-cni
3 changes: 2 additions & 1 deletion chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ csv:

This version of the operator supports the following Istio versions:

- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
- v1.22.5
- v1.21.6
- latest (b1ee384c)
- latest (56697886)

[See this page](https://github.com/istio-ecosystem/sail-operator/blob/main/bundle/README.md) for instructions on how to use it.
support: Community based
Expand Down
Loading