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.

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

Bump istio to 1.22.3 #88

Merged
merged 1 commit into from
Jul 17, 2024
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/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.22.1.
// +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.22.1"}
// +kubebuilder:validation:Enum=v1.22.1
// +kubebuilder:default=v1.22.1
// Must be one of: v1.22.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.22.3"}
// +kubebuilder:validation:Enum=v1.22.3
// +kubebuilder:default=v1.22.3
Version string `json:"version"`

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

// +kubebuilder:default={version: "v1.22.1", namespace: "istio-system", updateStrategy: {type:"InPlace"}}
// +kubebuilder:default={version: "v1.22.3", 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.22.1.
// +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.22.1"}
// +kubebuilder:validation:Enum=v1.22.1
// +kubebuilder:default=v1.22.1
// Must be one of: v1.22.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.22.3"}
// +kubebuilder:validation:Enum=v1.22.3
// +kubebuilder:default=v1.22.3
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.22.1", namespace: "istio-cni"}
// +kubebuilder:default={version: "v1.22.3", 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.22.1.
// +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.22.1"}
// +kubebuilder:validation:Enum=v1.22.1
// Must be one of: v1.22.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.22.3"}
// +kubebuilder:validation:Enum=v1.22.3
Version string `json:"version"`

// Namespace to which the Istio components should be installed.
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/operator.istio.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.22.1
version: v1.22.3
description: IstioCNISpec defines the desired state of IstioCNI
properties:
namespace:
Expand Down Expand Up @@ -1405,12 +1405,12 @@ spec:
type: object
type: object
version:
default: v1.22.1
default: v1.22.3
description: |-
Defines the version of Istio to install.
Must be one of: v1.22.1.
Must be one of: v1.22.3.
enum:
- v1.22.1
- v1.22.3
type: string
required:
- namespace
Expand Down
4 changes: 2 additions & 2 deletions bundle/manifests/operator.istio.io_istiorevisions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8056,9 +8056,9 @@ spec:
version:
description: |-
Defines the version of Istio to install.
Must be one of: v1.22.1.
Must be one of: v1.22.3.
enum:
- v1.22.1
- v1.22.3
type: string
required:
- namespace
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/operator.istio.io_istios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
namespace: istio-system
updateStrategy:
type: InPlace
version: v1.22.1
version: v1.22.3
description: IstioSpec defines the desired state of Istio
properties:
namespace:
Expand Down Expand Up @@ -8123,12 +8123,12 @@ spec:
type: object
type: object
version:
default: v1.22.1
default: v1.22.3
description: |-
Defines the version of Istio to install.
Must be one of: v1.22.1.
Must be one of: v1.22.3.
enum:
- v1.22.1
- v1.22.3
type: string
required:
- namespace
Expand Down
28 changes: 14 additions & 14 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.22.1"
"version": "v1.22.3"
}
},
{
Expand All @@ -27,14 +27,14 @@ metadata:
},
"spec": {
"namespace": "istio-cni",
"version": "v1.22.1"
"version": "v1.22.3"
}
}
]
capabilities: Seamless Upgrades
categories: OpenShift Optional, Integration & Delivery, Networking, Security
containerImage: quay.io/maistra-dev/sail-operator:3.0.0-tp-latest
createdAt: "2024-07-11T11:01:04Z"
createdAt: "2024-07-17T09:48:18Z"
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 @@ -162,12 +162,12 @@ spec:
kind: IstioCNI
name: istiocnis.operator.istio.io
specDescriptors:
- description: 'Defines the version of Istio to install. Must be one of: v1.22.1.'
- description: 'Defines the version of Istio to install. Must be one of: v1.22.3.'
displayName: Istio Version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.1
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
- description: Namespace to which the Istio CNI component should be installed.
displayName: Namespace
path: namespace
Expand All @@ -194,12 +194,12 @@ spec:
kind: IstioRevision
name: istiorevisions.operator.istio.io
specDescriptors:
- description: 'Defines the version of Istio to install. Must be one of: v1.22.1.'
- description: 'Defines the version of Istio to install. Must be one of: v1.22.3.'
displayName: Istio Version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.1
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
- description: Namespace to which the Istio components should be installed.
displayName: Namespace
path: namespace
Expand Down Expand Up @@ -234,12 +234,12 @@ spec:
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:select:InPlace
- urn:alm:descriptor:com.tectonic.ui:select:RevisionBased
- description: 'Defines the version of Istio to install. Must be one of: v1.22.1.'
- description: 'Defines the version of Istio to install. Must be one of: v1.22.3.'
displayName: Istio Version
path: version
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldGroup:General
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.1
- urn:alm:descriptor:com.tectonic.ui:select:v1.22.3
- 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. The minimum and the
Expand Down Expand Up @@ -476,11 +476,11 @@ spec:
template:
metadata:
annotations:
images.v1_22_1.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.1.tp.1
images.v1_22_1.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
images.v1_22_1.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
images.v1_22_1.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
images.v1_22_1.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
images.v1_22_3.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.3.tp.1
images.v1_22_3.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
images.v1_22_3.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
images.v1_22_3.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
images.v1_22_3.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
kubectl.kubernetes.io/default-container: manager
labels:
app.kubernetes.io/created-by: servicemeshoperator3
Expand Down
8 changes: 4 additions & 4 deletions chart/crds/operator.istio.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.22.1
version: v1.22.3
description: IstioCNISpec defines the desired state of IstioCNI
properties:
namespace:
Expand Down Expand Up @@ -1405,12 +1405,12 @@ spec:
type: object
type: object
version:
default: v1.22.1
default: v1.22.3
description: |-
Defines the version of Istio to install.
Must be one of: v1.22.1.
Must be one of: v1.22.3.
enum:
- v1.22.1
- v1.22.3
type: string
required:
- namespace
Expand Down
4 changes: 2 additions & 2 deletions chart/crds/operator.istio.io_istiorevisions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8056,9 +8056,9 @@ spec:
version:
description: |-
Defines the version of Istio to install.
Must be one of: v1.22.1.
Must be one of: v1.22.3.
enum:
- v1.22.1
- v1.22.3
type: string
required:
- namespace
Expand Down
8 changes: 4 additions & 4 deletions chart/crds/operator.istio.io_istios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
namespace: istio-system
updateStrategy:
type: InPlace
version: v1.22.1
version: v1.22.3
description: IstioSpec defines the desired state of Istio
properties:
namespace:
Expand Down Expand Up @@ -8123,12 +8123,12 @@ spec:
type: object
type: object
version:
default: v1.22.1
default: v1.22.3
description: |-
Defines the version of Istio to install.
Must be one of: v1.22.1.
Must be one of: v1.22.3.
enum:
- v1.22.1
- v1.22.3
type: string
required:
- namespace
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.22.1
version: v1.22.3
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.22.1
version: v1.22.3
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.22.1
version: v1.22.3
namespace: istio-cni
10 changes: 5 additions & 5 deletions ossm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: servicemeshoperator3
deployment:
name: servicemesh-operator3
annotations:
images.v1_22_1.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
images.v1_22_1.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
images.v1_22_1.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.1.tp.1
images.v1_22_3.istiod: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
images.v1_22_3.proxy: registry.redhat.io/openshift-service-mesh/istio-proxyv2-rhel9:3.0.0.tp.1
images.v1_22_3.cni: registry.redhat.io/openshift-service-mesh/istio-cni-rhel9:1.22.3.tp.1
# TODO insert ztunnel image name once we're shipping ztunnel
images.v1_22_1.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.1.tp.1
images.v1_22_1.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
images.v1_22_3.ztunnel: registry.redhat.io/openshift-service-mesh/istio-pilot-rhel9:1.22.3.tp.1
images.v1_22_3.must-gather: registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel9:3.0.0.tp.1
service:
port: 8443
serviceAccountName: servicemesh-operator3
Expand Down
18 changes: 9 additions & 9 deletions ossm/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
# versions specified below can be the source of the CRDs. Because CRDs are
# typically backwards-compatible, the following field should point to the
# most recent version.
crdSourceVersion: v1.22.1
crdSourceVersion: v1.22.3
# The list of versions to support. Each item specifies the name of the version,
# the Git repository and commit hash for retrieving the profiles, and
# a list of URLs for retrieving the charts.
# The first item in the list is the default version.
versions:
- name: v1.22.1
version: 1.22.1
- name: v1.22.3
version: 1.22.3
repo: https://github.com/istio/istio
commit: 1.22.1
commit: 1.22.3
charts:
- https://istio-release.storage.googleapis.com/charts/base-1.22.1.tgz
- https://istio-release.storage.googleapis.com/charts/istiod-1.22.1.tgz
- https://istio-release.storage.googleapis.com/charts/gateway-1.22.1.tgz
- https://istio-release.storage.googleapis.com/charts/cni-1.22.1.tgz
- https://istio-release.storage.googleapis.com/charts/ztunnel-1.22.1.tgz
- https://istio-release.storage.googleapis.com/charts/base-1.22.3.tgz
- https://istio-release.storage.googleapis.com/charts/istiod-1.22.3.tgz
- https://istio-release.storage.googleapis.com/charts/gateway-1.22.3.tgz
- https://istio-release.storage.googleapis.com/charts/cni-1.22.3.tgz
- https://istio-release.storage.googleapis.com/charts/ztunnel-1.22.3.tgz

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
appVersion: 1.22.1
appVersion: 1.22.3
description: Helm chart for deploying Istio cluster resources and CRDs
icon: https://istio.io/latest/favicons/android-192x192.png
keywords:
- istio
name: base
sources:
- https://github.com/istio/istio
version: 1.22.1
version: 1.22.3
Loading