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
2 changes: 1 addition & 1 deletion Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ OPM_VERSION ?= v1.60.0
OLM_VERSION ?= v0.34.0
GITLEAKS_VERSION ?= v8.28.0
ISTIOCTL_VERSION ?= 1.26.2
RUNME_VERSION ?= 3.15.3
RUNME_VERSION ?= 3.15.4
MISSPELL_VERSION ?= v0.3.4

.PHONY: helm $(HELM)
Expand Down
6 changes: 3 additions & 3 deletions api/v1/istio_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ const (
type IstioSpec struct {
// +sail:version
// Defines the version of Istio to install.
// Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.423eb7cf.
// +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.27-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:master", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf"}
// +kubebuilder:validation:Enum=v1.27-latest;v1.27.1;v1.27.0;v1.26-latest;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25-latest;v1.25.5;v1.25.4;v1.25.3;v1.25.2;v1.25.1;v1.24-latest;v1.24.6;v1.24.5;v1.24.4;v1.24.3;v1.24.2;v1.24.1;v1.24.0;v1.23-latest;v1.23.6;v1.23.5;v1.23.4;v1.23.3;v1.23.2;v1.22-latest;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;master;v1.28-alpha.423eb7cf
// Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.4b0fdcfb.
// +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.27-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:master", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb"}
// +kubebuilder:validation:Enum=v1.27-latest;v1.27.1;v1.27.0;v1.26-latest;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25-latest;v1.25.5;v1.25.4;v1.25.3;v1.25.2;v1.25.1;v1.24-latest;v1.24.6;v1.24.5;v1.24.4;v1.24.3;v1.24.2;v1.24.1;v1.24.0;v1.23-latest;v1.23.6;v1.23.5;v1.23.4;v1.23.3;v1.23.2;v1.22-latest;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;master;v1.28-alpha.4b0fdcfb
// +kubebuilder:default=v1.27.1
Version string `json:"version"`

Expand Down
6 changes: 3 additions & 3 deletions api/v1/istiocni_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ const (
type IstioCNISpec struct {
// +sail:version
// Defines the version of Istio to install.
// Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.423eb7cf.
// +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.27-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:master", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf"}
// +kubebuilder:validation:Enum=v1.27-latest;v1.27.1;v1.27.0;v1.26-latest;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25-latest;v1.25.5;v1.25.4;v1.25.3;v1.25.2;v1.25.1;v1.24-latest;v1.24.6;v1.24.5;v1.24.4;v1.24.3;v1.24.2;v1.24.1;v1.24.0;v1.23-latest;v1.23.6;v1.23.5;v1.23.4;v1.23.3;v1.23.2;v1.22-latest;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;master;v1.28-alpha.423eb7cf
// Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.4b0fdcfb.
// +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.27-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:master", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb"}
// +kubebuilder:validation:Enum=v1.27-latest;v1.27.1;v1.27.0;v1.26-latest;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25-latest;v1.25.5;v1.25.4;v1.25.3;v1.25.2;v1.25.1;v1.24-latest;v1.24.6;v1.24.5;v1.24.4;v1.24.3;v1.24.2;v1.24.1;v1.24.0;v1.23-latest;v1.23.6;v1.23.5;v1.23.4;v1.23.3;v1.23.2;v1.22-latest;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;master;v1.28-alpha.4b0fdcfb
// +kubebuilder:default=v1.27.1
Version string `json:"version"`

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.27.1, v1.27.0, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.28-alpha.423eb7cf.
// +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.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf"}
// +kubebuilder:validation:Enum=v1.27.1;v1.27.0;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25.5;v1.25.4;v1.25.3;v1.25.2;v1.25.1;v1.24.6;v1.24.5;v1.24.4;v1.24.3;v1.24.2;v1.24.1;v1.24.0;v1.23.6;v1.23.5;v1.23.4;v1.23.3;v1.23.2;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;v1.28-alpha.423eb7cf
// Must be one of: v1.27.1, v1.27.0, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.28-alpha.4b0fdcfb.
// +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.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb"}
// +kubebuilder:validation:Enum=v1.27.1;v1.27.0;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25.5;v1.25.4;v1.25.3;v1.25.2;v1.25.1;v1.24.6;v1.24.5;v1.24.4;v1.24.3;v1.24.2;v1.24.1;v1.24.0;v1.23.6;v1.23.5;v1.23.4;v1.23.3;v1.23.2;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;v1.28-alpha.4b0fdcfb
Version string `json:"version"`

// Namespace to which the Istio components should be installed.
Expand Down
27 changes: 23 additions & 4 deletions api/v1/values_types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions api/v1alpha1/ztunnel_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ const (
type ZTunnelSpec struct {
// +sail:version
// Defines the version of Istio to install.
// Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.25-latest, v1.24-latest, master, v1.28-alpha.423eb7cf.
// +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.27-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.25-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24-latest", "urn:alm:descriptor:com.tectonic.ui:select:master", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf"}
// +kubebuilder:validation:Enum=v1.27-latest;v1.27.1;v1.27.0;v1.26-latest;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25-latest;v1.24-latest;master;v1.28-alpha.423eb7cf
// Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.25-latest, v1.24-latest, master, v1.28-alpha.4b0fdcfb.
// +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.27-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.27.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.26-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.4", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.26.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.25-latest", "urn:alm:descriptor:com.tectonic.ui:select:v1.24-latest", "urn:alm:descriptor:com.tectonic.ui:select:master", "urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb"}
// +kubebuilder:validation:Enum=v1.27-latest;v1.27.1;v1.27.0;v1.26-latest;v1.26.4;v1.26.3;v1.26.2;v1.26.0;v1.25-latest;v1.24-latest;master;v1.28-alpha.4b0fdcfb
// +kubebuilder:default=v1.27.1
Version string `json:"version"`

Expand Down
28 changes: 14 additions & 14 deletions bundle/manifests/sailoperator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ metadata:
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: quay.io/sail-dev/sail-operator:1.28-latest
createdAt: "2025-10-09T05:05:24Z"
createdAt: "2025-10-11T05:05:11Z"
description: The Sail Operator manages the lifecycle of your Istio control plane. It provides custom resources for you to deploy and manage your control plane components.
features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "true"
Expand Down Expand Up @@ -165,7 +165,7 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.423eb7cf.
Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.4b0fdcfb.
displayName: Istio Version
path: version
x-descriptors:
Expand All @@ -179,7 +179,7 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:select:v1.26.2
- urn:alm:descriptor:com.tectonic.ui:select:v1.26.0
- urn:alm:descriptor:com.tectonic.ui:select:master
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb
- description: Namespace to which the Istio CNI component should be installed. Note that this field is immutable.
displayName: Namespace
path: namespace
Expand Down Expand Up @@ -217,7 +217,7 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.27.1, v1.27.0, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.28-alpha.423eb7cf.
Must be one of: v1.27.1, v1.27.0, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.28-alpha.4b0fdcfb.
displayName: Istio Version
path: version
x-descriptors:
Expand All @@ -228,7 +228,7 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:select:v1.26.3
- urn:alm:descriptor:com.tectonic.ui:select:v1.26.2
- urn:alm:descriptor:com.tectonic.ui:select:v1.26.0
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb
- description: Namespace to which the Istio components should be installed.
displayName: Namespace
path: namespace
Expand Down Expand Up @@ -263,7 +263,7 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
- description: |-
Defines the version of Istio to install.
Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.423eb7cf.
Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, master, v1.28-alpha.4b0fdcfb.
displayName: Istio Version
path: version
x-descriptors:
Expand All @@ -277,7 +277,7 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:select:v1.26.2
- urn:alm:descriptor:com.tectonic.ui:select:v1.26.0
- urn:alm:descriptor:com.tectonic.ui:select:master
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb
- description: |-
Defines how many seconds the operator should wait before removing a non-active revision after all
the workloads have stopped using it. You may want to set this value on the order of minutes.
Expand Down Expand Up @@ -333,7 +333,7 @@ spec:
specDescriptors:
- description: |-
Defines the version of Istio to install.
Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.25-latest, v1.24-latest, master, v1.28-alpha.423eb7cf.
Must be one of: v1.27-latest, v1.27.1, v1.27.0, v1.26-latest, v1.26.4, v1.26.3, v1.26.2, v1.26.0, v1.25-latest, v1.24-latest, master, v1.28-alpha.4b0fdcfb.
displayName: Istio Version
path: version
x-descriptors:
Expand All @@ -349,7 +349,7 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:select:v1.25-latest
- urn:alm:descriptor:com.tectonic.ui:select:v1.24-latest
- urn:alm:descriptor:com.tectonic.ui:select:master
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.423eb7cf
- urn:alm:descriptor:com.tectonic.ui:select:v1.28-alpha.4b0fdcfb
- description: Namespace to which the Istio ztunnel component should be installed.
displayName: Namespace
path: namespace
Expand Down Expand Up @@ -381,7 +381,7 @@ spec:
- v1.26.2
- v1.26.0
- master
- v1.28-alpha.423eb7cf
- v1.28-alpha.4b0fdcfb

[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 @@ -697,10 +697,10 @@ spec:
images.v1_27_1.istiod: gcr.io/istio-release/pilot:1.27.1
images.v1_27_1.proxy: gcr.io/istio-release/proxyv2:1.27.1
images.v1_27_1.ztunnel: gcr.io/istio-release/ztunnel:1.27.1
images.v1_28-alpha_423eb7cf.cni: gcr.io/istio-testing/install-cni:1.28-alpha.423eb7cf34db72973dbacdf4ed9d5d4e716d1f63
images.v1_28-alpha_423eb7cf.istiod: gcr.io/istio-testing/pilot:1.28-alpha.423eb7cf34db72973dbacdf4ed9d5d4e716d1f63
images.v1_28-alpha_423eb7cf.proxy: gcr.io/istio-testing/proxyv2:1.28-alpha.423eb7cf34db72973dbacdf4ed9d5d4e716d1f63
images.v1_28-alpha_423eb7cf.ztunnel: gcr.io/istio-testing/ztunnel:1.28-alpha.423eb7cf34db72973dbacdf4ed9d5d4e716d1f63
images.v1_28-alpha_4b0fdcfb.cni: gcr.io/istio-testing/install-cni:1.28-alpha.4b0fdcfb9ab3a6241d254309036c8714501e669d
images.v1_28-alpha_4b0fdcfb.istiod: gcr.io/istio-testing/pilot:1.28-alpha.4b0fdcfb9ab3a6241d254309036c8714501e669d
images.v1_28-alpha_4b0fdcfb.proxy: gcr.io/istio-testing/proxyv2:1.28-alpha.4b0fdcfb9ab3a6241d254309036c8714501e669d
images.v1_28-alpha_4b0fdcfb.ztunnel: gcr.io/istio-testing/ztunnel:1.28-alpha.4b0fdcfb9ab3a6241d254309036c8714501e669d
kubectl.kubernetes.io/default-container: sail-operator
labels:
app.kubernetes.io/created-by: sailoperator
Expand Down
Loading
Loading