Skip to content

Commit

Permalink
Automator: Update dependencies in istio-ecosystem/sail-operator@main (#…
Browse files Browse the repository at this point in the history
…578)

Signed-off-by: openshift-service-mesh-bot <[email protected]>
  • Loading branch information
openshift-service-mesh-bot authored Jan 25, 2025
1 parent 6f59106 commit 6329a71
Show file tree
Hide file tree
Showing 206 changed files with 21,861 additions and 611 deletions.
2 changes: 1 addition & 1 deletion Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ HELM_VERSION ?= v3.17.0
CONTROLLER_TOOLS_VERSION ?= v0.17.1
OPM_VERSION ?= v1.50.0
OLM_VERSION ?= v0.31.0
GITLEAKS_VERSION ?= v8.23.1
GITLEAKS_VERSION ?= v8.23.2
ISTIOCTL_VERSION ?= 1.23.0

# GENERATE_RELATED_IMAGES defines whether `spec.relatedImages` is going to be generated or not
Expand Down
6 changes: 3 additions & 3 deletions api/v1alpha1/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.24.2, v1.24.1, v1.24.0, v1.23.4, v1.23.3, v1.23.2, v1.22.7, 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.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.4", "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.7", "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.2;v1.24.1;v1.24.0;v1.23.4;v1.23.3;v1.23.2;v1.22.7;v1.22.6;v1.22.5;v1.21.6;latest
// Must be one of: v1.24.2, v1.24.1, v1.24.0, v1.23.4, v1.23.3, v1.23.2, v1.22.8, v1.22.7, 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.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.4", "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.8", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.7", "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.2;v1.24.1;v1.24.0;v1.23.4;v1.23.3;v1.23.2;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;latest
// +kubebuilder:default=v1.24.2
Version string `json:"version"`

Expand Down
6 changes: 3 additions & 3 deletions api/v1alpha1/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.24.2, v1.24.1, v1.24.0, v1.23.4, v1.23.3, v1.23.2, v1.22.7, 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.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.4", "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.7", "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.2;v1.24.1;v1.24.0;v1.23.4;v1.23.3;v1.23.2;v1.22.7;v1.22.6;v1.22.5;v1.21.6;latest
// Must be one of: v1.24.2, v1.24.1, v1.24.0, v1.23.4, v1.23.3, v1.23.2, v1.22.8, v1.22.7, 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.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.4", "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.8", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.7", "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.2;v1.24.1;v1.24.0;v1.23.4;v1.23.3;v1.23.2;v1.22.8;v1.22.7;v1.22.6;v1.22.5;v1.21.6;latest
// +kubebuilder:default=v1.24.2
Version string `json:"version"`

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.24.2, v1.24.1, v1.24.0, v1.23.4, v1.23.3, v1.23.2, v1.22.7, 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.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.4", "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.7", "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.2;v1.24.1;v1.24.0;v1.23.4;v1.23.3;v1.23.2;v1.22.7;v1.22.6;v1.22.5;v1.21.6;latest
// Must be one of: v1.24.2, v1.24.1, v1.24.0, v1.23.4, v1.23.3, v1.23.2, v1.22.8, v1.22.7, 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.2", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.4", "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.8", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.7", "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.2;v1.24.1;v1.24.0;v1.23.4;v1.23.3;v1.23.2;v1.22.8;v1.22.7;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
5 changes: 3 additions & 2 deletions api/v1alpha1/values_types.gen.go

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

12 changes: 0 additions & 12 deletions bundle/manifests/extensions.istio.io_wasmplugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,6 @@ spec:
- kind
- name
type: object
x-kubernetes-validations:
- message: Support kinds are core/Service, networking.istio.io/ServiceEntry,
gateway.networking.k8s.io/Gateway
rule: '[self.group, self.kind] in [["core", "Service"], ["", "Service"],
["gateway.networking.k8s.io", "Gateway"], ["networking.istio.io",
"ServiceEntry"]]'
targetRefs:
description: Optional.
items:
Expand Down Expand Up @@ -213,12 +207,6 @@ spec:
- kind
- name
type: object
x-kubernetes-validations:
- message: Support kinds are core/Service, networking.istio.io/ServiceEntry,
gateway.networking.k8s.io/Gateway
rule: '[self.group, self.kind] in [["core", "Service"], ["", "Service"],
["gateway.networking.k8s.io", "Gateway"], ["networking.istio.io",
"ServiceEntry"]]'
maxItems: 16
type: array
type:
Expand Down
9 changes: 3 additions & 6 deletions bundle/manifests/networking.istio.io_envoyfilters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ spec:
description: Match a specific virtual host in a route
configuration and apply the patch to the virtual host.
properties:
domainName:
description: Match a domain name in a virtual host.
type: string
name:
description: The VirtualHosts objects generated
by Istio are named as host:port, where the host
Expand Down Expand Up @@ -299,12 +302,6 @@ spec:
- kind
- name
type: object
x-kubernetes-validations:
- message: Support kinds are core/Service, networking.istio.io/ServiceEntry,
gateway.networking.k8s.io/Gateway
rule: '[self.group, self.kind] in [["core", "Service"], ["", "Service"],
["gateway.networking.k8s.io", "Gateway"], ["networking.istio.io",
"ServiceEntry"]]'
maxItems: 16
type: array
workloadSelector:
Expand Down
51 changes: 24 additions & 27 deletions bundle/manifests/networking.istio.io_serviceentries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
- message: Address is required
rule: has(self.address) || has(self.network)
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://"))
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
maxItems: 4096
type: array
Expand Down Expand Up @@ -231,16 +231,15 @@ spec:
1 : 0) <= 1'
- message: CIDR addresses are allowed only for NONE/STATIC resolution
types
rule: |-
!(has(self.addresses) && self.addresses.exists(k, k.contains("/")) && has(self.resolution) &&
self.resolution != "STATIC" && self.resolution != "NONE")
rule: '!((has(self.addresses) ? self.addresses : []).exists(k, k.contains("/"))
&& !((has(self.resolution) ? self.resolution : "NONE") in ["STATIC",
"NONE"]))'
- message: NONE mode cannot set endpoints
rule: '(!has(self.resolution) || self.resolution == "NONE") ? !has(self.endpoints)
: true'
rule: '((has(self.resolution) ? self.resolution : "NONE") == "NONE")
? !has(self.endpoints) : true'
- message: DNS_ROUND_ROBIN mode cannot have multiple endpoints
rule: |-
(has(self.resolution) && self.resolution == "DNS_ROUND_ROBIN") ? (!has(self.endpoints) ||
size(self.endpoints) == 1) : true
rule: '((has(self.resolution) ? self.resolution : "") == "DNS_ROUND_ROBIN")
? ((has(self.endpoints) ? self.endpoints : []).size() <= 1) : true'
status:
properties:
conditions:
Expand Down Expand Up @@ -420,7 +419,7 @@ spec:
- message: Address is required
rule: has(self.address) || has(self.network)
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://"))
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
maxItems: 4096
type: array
Expand Down Expand Up @@ -530,16 +529,15 @@ spec:
1 : 0) <= 1'
- message: CIDR addresses are allowed only for NONE/STATIC resolution
types
rule: |-
!(has(self.addresses) && self.addresses.exists(k, k.contains("/")) && has(self.resolution) &&
self.resolution != "STATIC" && self.resolution != "NONE")
rule: '!((has(self.addresses) ? self.addresses : []).exists(k, k.contains("/"))
&& !((has(self.resolution) ? self.resolution : "NONE") in ["STATIC",
"NONE"]))'
- message: NONE mode cannot set endpoints
rule: '(!has(self.resolution) || self.resolution == "NONE") ? !has(self.endpoints)
: true'
rule: '((has(self.resolution) ? self.resolution : "NONE") == "NONE")
? !has(self.endpoints) : true'
- message: DNS_ROUND_ROBIN mode cannot have multiple endpoints
rule: |-
(has(self.resolution) && self.resolution == "DNS_ROUND_ROBIN") ? (!has(self.endpoints) ||
size(self.endpoints) == 1) : true
rule: '((has(self.resolution) ? self.resolution : "") == "DNS_ROUND_ROBIN")
? ((has(self.endpoints) ? self.endpoints : []).size() <= 1) : true'
status:
properties:
conditions:
Expand Down Expand Up @@ -719,7 +717,7 @@ spec:
- message: Address is required
rule: has(self.address) || has(self.network)
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://"))
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
maxItems: 4096
type: array
Expand Down Expand Up @@ -829,16 +827,15 @@ spec:
1 : 0) <= 1'
- message: CIDR addresses are allowed only for NONE/STATIC resolution
types
rule: |-
!(has(self.addresses) && self.addresses.exists(k, k.contains("/")) && has(self.resolution) &&
self.resolution != "STATIC" && self.resolution != "NONE")
rule: '!((has(self.addresses) ? self.addresses : []).exists(k, k.contains("/"))
&& !((has(self.resolution) ? self.resolution : "NONE") in ["STATIC",
"NONE"]))'
- message: NONE mode cannot set endpoints
rule: '(!has(self.resolution) || self.resolution == "NONE") ? !has(self.endpoints)
: true'
rule: '((has(self.resolution) ? self.resolution : "NONE") == "NONE")
? !has(self.endpoints) : true'
- message: DNS_ROUND_ROBIN mode cannot have multiple endpoints
rule: |-
(has(self.resolution) && self.resolution == "DNS_ROUND_ROBIN") ? (!has(self.endpoints) ||
size(self.endpoints) == 1) : true
rule: '((has(self.resolution) ? self.resolution : "") == "DNS_ROUND_ROBIN")
? ((has(self.endpoints) ? self.endpoints : []).size() <= 1) : true'
status:
properties:
conditions:
Expand Down
12 changes: 6 additions & 6 deletions bundle/manifests/networking.istio.io_workloadentries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ spec:
- message: Address is required
rule: has(self.address) || has(self.network)
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://")) ? !has(self.ports)
: true'
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
status:
properties:
conditions:
Expand Down Expand Up @@ -260,8 +260,8 @@ spec:
- message: Address is required
rule: has(self.address) || has(self.network)
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://")) ? !has(self.ports)
: true'
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
status:
properties:
conditions:
Expand Down Expand Up @@ -420,8 +420,8 @@ spec:
- message: Address is required
rule: has(self.address) || has(self.network)
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://")) ? !has(self.ports)
: true'
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
status:
properties:
conditions:
Expand Down
6 changes: 3 additions & 3 deletions bundle/manifests/networking.istio.io_workloadgroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ spec:
type: object
x-kubernetes-validations:
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://"))
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
required:
- template
Expand Down Expand Up @@ -551,7 +551,7 @@ spec:
type: object
x-kubernetes-validations:
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://"))
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
required:
- template
Expand Down Expand Up @@ -859,7 +859,7 @@ spec:
type: object
x-kubernetes-validations:
- message: UDS may not include ports
rule: '(has(self.address) && self.address.startsWith("unix://"))
rule: '(has(self.address) ? self.address : "").startsWith("unix://")
? !has(self.ports) : true'
required:
- template
Expand Down
Loading

0 comments on commit 6329a71

Please sign in to comment.