Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/v1/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.24-latest, v1.24.4, v1.24.3.
// +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-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24-latest;v1.24.4;v1.24.3
// +kubebuilder:default=v1.24.4
// Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
// +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-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24-latest;v1.24.5;v1.24.4;v1.24.3
// +kubebuilder:default=v1.24.5
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.24.4", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
// +kubebuilder:default={version: "v1.24.5", 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/v1/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.24-latest, v1.24.4, v1.24.3.
// +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-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24-latest;v1.24.4;v1.24.3
// +kubebuilder:default=v1.24.4
// Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
// +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-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24-latest;v1.24.5;v1.24.4;v1.24.3
// +kubebuilder:default=v1.24.5
Version string `json:"version"`

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

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

Status IstioCNIStatus `json:"status,omitempty"`
Expand Down
6 changes: 3 additions & 3 deletions api/v1/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.24.4, v1.24.3.
// +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.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24.4;v1.24.3
// Must be one of: v1.24.5, v1.24.4, v1.24.3.
// +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.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24.5;v1.24.4;v1.24.3
Version string `json:"version"`

// Namespace to which the Istio components should be installed.
Expand Down
10 changes: 5 additions & 5 deletions api/v1alpha1/ztunnel_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ const (
type ZTunnelSpec struct {
// +sail:version
// Defines the version of Istio to install.
// Must be one of: v1.24-latest, v1.24.4, v1.24.3.
// +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-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24-latest;v1.24.4;v1.24.3
// +kubebuilder:default=v1.24.4
// Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
// +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-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.5", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.3"}
// +kubebuilder:validation:Enum=v1.24-latest;v1.24.5;v1.24.4;v1.24.3
// +kubebuilder:default=v1.24.5
Version string `json:"version"`

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

// +kubebuilder:default={version: "v1.24.4", namespace: "ztunnel", profile: "ambient"}
// +kubebuilder:default={version: "v1.24.5", namespace: "ztunnel", profile: "ambient"}
Spec ZTunnelSpec `json:"spec,omitempty"`

Status ZTunnelStatus `json:"status,omitempty"`
Expand Down
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.24.4
version: v1.24.5
description: IstioCNISpec defines the desired state of IstioCNI
properties:
namespace:
Expand Down Expand Up @@ -1432,12 +1432,13 @@ spec:
type: object
type: object
version:
default: v1.24.4
default: v1.24.5
description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24-latest
- v1.24.5
- v1.24.4
- v1.24.3
type: string
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.24.4, v1.24.3.
Must be one of: v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24.5
- v1.24.4
- v1.24.3
type: string
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.24.4
version: v1.24.5
description: IstioSpec defines the desired state of Istio
properties:
namespace:
Expand Down Expand Up @@ -9455,12 +9455,13 @@ spec:
type: object
type: object
version:
default: v1.24.4
default: v1.24.5
description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24-latest
- v1.24.5
- v1.24.4
- v1.24.3
type: string
Expand Down
7 changes: 4 additions & 3 deletions bundle/manifests/sailoperator.io_ztunnels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
default:
namespace: ztunnel
profile: ambient
version: v1.24.4
version: v1.24.5
description: ZTunnelSpec defines the desired state of ZTunnel
properties:
namespace:
Expand Down Expand Up @@ -5485,12 +5485,13 @@ spec:
type: object
type: object
version:
default: v1.24.4
default: v1.24.5
description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24-latest
- v1.24.5
- v1.24.4
- v1.24.3
type: string
Expand Down
18 changes: 11 additions & 7 deletions bundle/manifests/servicemeshoperator3.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.24.4"
"version": "v1.24.5"
}
},
{
Expand All @@ -27,14 +27,14 @@ metadata:
},
"spec": {
"namespace": "istio-cni",
"version": "v1.24.4"
"version": "v1.24.5"
}
}
]
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: quay.io/maistra-dev/sail-operator:3.0-latest
createdAt: "2025-04-24T08:32:51Z"
createdAt: "2025-05-12T13:12:42Z"
description: The OpenShift Service Mesh Operator enables you to install, configure,
and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service
Mesh is based on the open source Istio project.
Expand Down Expand Up @@ -169,12 +169,13 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
displayName: Istio Version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
- urn:alm:descriptor:com.tectonic.ui:select:v1.24-latest
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.5
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.4
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.3
- description: Namespace to which the Istio CNI component should be installed.
Expand Down Expand Up @@ -207,11 +208,12 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.24.4, v1.24.3.
Must be one of: v1.24.5, v1.24.4, v1.24.3.
displayName: Istio Version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.5
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.4
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.3
- description: Namespace to which the Istio components should be installed.
Expand Down Expand Up @@ -259,12 +261,13 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
- description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
displayName: Istio Version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
- urn:alm:descriptor:com.tectonic.ui:select:v1.24-latest
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.5
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.4
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.3
- description: |-
Expand Down Expand Up @@ -316,12 +319,13 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
displayName: Istio Version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
- urn:alm:descriptor:com.tectonic.ui:select:v1.24-latest
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.5
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.4
- urn:alm:descriptor:com.tectonic.ui:select:v1.24.3
- description: Namespace to which the Istio ztunnel component should be installed.
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.24.4
version: v1.24.5
description: IstioCNISpec defines the desired state of IstioCNI
properties:
namespace:
Expand Down Expand Up @@ -1432,12 +1432,13 @@ spec:
type: object
type: object
version:
default: v1.24.4
default: v1.24.5
description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24-latest
- v1.24.5
- v1.24.4
- v1.24.3
type: string
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.24.4, v1.24.3.
Must be one of: v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24.5
- v1.24.4
- v1.24.3
type: string
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.24.4
version: v1.24.5
description: IstioSpec defines the desired state of Istio
properties:
namespace:
Expand Down Expand Up @@ -9455,12 +9455,13 @@ spec:
type: object
type: object
version:
default: v1.24.4
default: v1.24.5
description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24-latest
- v1.24.5
- v1.24.4
- v1.24.3
type: string
Expand Down
7 changes: 4 additions & 3 deletions chart/crds/sailoperator.io_ztunnels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
default:
namespace: ztunnel
profile: ambient
version: v1.24.4
version: v1.24.5
description: ZTunnelSpec defines the desired state of ZTunnel
properties:
namespace:
Expand Down Expand Up @@ -5485,12 +5485,13 @@ spec:
type: object
type: object
version:
default: v1.24.4
default: v1.24.5
description: |-
Defines the version of Istio to install.
Must be one of: v1.24-latest, v1.24.4, v1.24.3.
Must be one of: v1.24-latest, v1.24.5, v1.24.4, v1.24.3.
enum:
- v1.24-latest
- v1.24.5
- v1.24.4
- v1.24.3
type: string
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/ambient/istio-sample.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.24.4
version: v1.24.5
namespace: istio-system
profile: ambient
updateStrategy:
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/ambient/istiocni-sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: IstioCNI
metadata:
name: default
spec:
version: v1.24.4
version: v1.24.5
profile: ambient
namespace: istio-cni
2 changes: 1 addition & 1 deletion chart/samples/ambient/istioztunnel-sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: ZTunnel
metadata:
name: default
spec:
version: v1.24.4
version: v1.24.5
namespace: ztunnel
profile: ambient
2 changes: 1 addition & 1 deletion chart/samples/istio-sample-gw-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Istio
metadata:
name: gateway-controller
spec:
version: v1.24.4
version: v1.24.5
namespace: gateway-controller
updateStrategy:
type: InPlace
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/istio-sample-revisionbased.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.24.4
version: v1.24.5
namespace: istio-system
updateStrategy:
type: RevisionBased
Expand Down
2 changes: 1 addition & 1 deletion chart/samples/istio-sample.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.24.4
version: v1.24.5
namespace: istio-system
updateStrategy:
type: InPlace
Expand Down
Loading