Skip to content

Commit

Permalink
Add 1.24.0 (istio-ecosystem#474)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Grimm <[email protected]>
Co-authored-by: Filip Brychta <[email protected]>
  • Loading branch information
dgn and FilipB authored Nov 13, 2024
1 parent 9bde6d6 commit 94b6c47
Show file tree
Hide file tree
Showing 167 changed files with 25,338 additions and 41 deletions.
10 changes: 5 additions & 5 deletions api/v1alpha1/istio_types.go
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
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
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
28 changes: 22 additions & 6 deletions bundle/manifests/sailoperator.clusterserviceversion.yaml
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-13T05:05:11Z"
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,6 +309,7 @@ spec:
This version of the operator supports the following Istio versions:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down Expand Up @@ -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 @@ -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
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
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
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
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
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
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
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
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
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
1 change: 1 addition & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ csv:
This version of the operator supports the following Istio versions:
- v1.24.0
- v1.23.3
- v1.23.2
- v1.22.6
Expand Down
Loading

0 comments on commit 94b6c47

Please sign in to comment.