Skip to content

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.0 #258

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.

Sign up for GitHub

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

Closed
openshift-service-mesh-bot wants to merge 4 commits into from
Closed

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.0 #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
128a7aa
[release-1.0] Updating dependencies and istio versions (#673)
FilipB Feb 24, 2025
e1d5fb9
[Manual Cherry-pick to release-1.0 branch] e2e IstioRevisionTag test …
fjglira Feb 26, 2025
6bfc1ba
Automated merge
Feb 26, 2025
960af85
Automated regeneration
Feb 26, 2025
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
6 changes: 3 additions & 3 deletions Makefile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,11 @@ ISTIOCTL ?= $(LOCALBIN)/istioctl

## Tool Versions
OPERATOR_SDK_VERSION ?= v1.39.1
HELM_VERSION ?= v3.17.0
CONTROLLER_TOOLS_VERSION ?= v0.17.1
HELM_VERSION ?= v3.17.1
CONTROLLER_TOOLS_VERSION ?= v0.17.2
OPM_VERSION ?= v1.50.0
OLM_VERSION ?= v0.31.0
GITLEAKS_VERSION ?= v8.23.1
GITLEAKS_VERSION ?= v8.24.0
ISTIOCTL_VERSION ?= 1.23.0

# GENERATE_RELATED_IMAGES defines whether `spec.relatedImages` is going to be generated or not
Expand Down
1 change: 0 additions & 1 deletion api/v1/values_types.gen.go
View file
Open in desktop

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

34 changes: 14 additions & 20 deletions bundle/manifests/extensions.istio.io_wasmplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ spec:
type: string
x-kubernetes-validations:
- message: wildcard not allowed in label value match
rule: '!self.contains("*")'
rule: '!self.contains(''*'')'
description: One or more labels that indicate a specific set of
pods/VMs on which a policy should be applied.
maxProperties: 4096
type: object
x-kubernetes-validations:
- message: wildcard not allowed in label key match
rule: self.all(key, !key.contains("*"))
rule: self.all(key, !key.contains('*'))
- message: key must not be empty
rule: self.all(key, key.size() != 0)
type: object
Expand Down Expand Up @@ -180,9 +180,8 @@ spec:
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"]]'
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 @@ -216,9 +215,8 @@ spec:
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"]]'
rule: '[self.group, self.kind] in [[''core'',''Service''], ['''',''Service''],
[''gateway.networking.k8s.io'',''Gateway''], [''networking.istio.io'',''ServiceEntry'']]'
maxItems: 16
type: array
type:
Expand All @@ -237,9 +235,10 @@ spec:
type: string
x-kubernetes-validations:
- message: url must have schema one of [http, https, file, oci]
rule: |-
isURL(self) ? (url(self).getScheme() in ["", "http", "https", "oci", "file"]) : (isURL("http://" + self) &&
url("http://" + self).getScheme() in ["", "http", "https", "oci", "file"])
rule: 'isURL(self) ? (url(self).getScheme() in ['''', ''http'',
''https'', ''oci'', ''file'']) : (isURL(''http://'' + self) &&
url(''http://'' +self).getScheme() in ['''', ''http'', ''https'',
''oci'', ''file''])'
verificationKey:
type: string
vmConfig:
Expand Down Expand Up @@ -273,7 +272,7 @@ spec:
type: object
x-kubernetes-validations:
- message: value may only be set when valueFrom is INLINE
rule: '(has(self.valueFrom) ? self.valueFrom : "") != "HOST"
rule: '(has(self.valueFrom) ? self.valueFrom : '''') != ''HOST''
|| !has(self.value)'
maxItems: 256
type: array
Expand All @@ -286,8 +285,7 @@ spec:
type: object
x-kubernetes-validations:
- message: only one of targetRefs or selector can be set
rule: '(has(self.selector) ? 1 : 0) + (has(self.targetRef) ? 1 : 0)
+ (has(self.targetRefs) ? 1 : 0) <= 1'
rule: (has(self.selector)?1:0)+(has(self.targetRef)?1:0)+(has(self.targetRefs)?1:0)<=1
status:
properties:
conditions:
Expand All @@ -307,12 +305,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -329,6 +321,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down
36 changes: 12 additions & 24 deletions bundle/manifests/networking.istio.io_destinationrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,14 +1844,14 @@ spec:
type: string
x-kubernetes-validations:
- message: wildcard not allowed in label value match
rule: '!self.contains("*")'
rule: '!self.contains(''*'')'
description: One or more labels that indicate a specific set of
pods/VMs on which a policy should be applied.
maxProperties: 4096
type: object
x-kubernetes-validations:
- message: wildcard not allowed in label key match
rule: self.all(key, !key.contains("*"))
rule: self.all(key, !key.contains('*'))
- message: key must not be empty
rule: self.all(key, key.size() != 0)
type: object
Expand All @@ -1877,12 +1877,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -1899,6 +1893,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down Expand Up @@ -3758,14 +3754,14 @@ spec:
type: string
x-kubernetes-validations:
- message: wildcard not allowed in label value match
rule: '!self.contains("*")'
rule: '!self.contains(''*'')'
description: One or more labels that indicate a specific set of
pods/VMs on which a policy should be applied.
maxProperties: 4096
type: object
x-kubernetes-validations:
- message: wildcard not allowed in label key match
rule: self.all(key, !key.contains("*"))
rule: self.all(key, !key.contains('*'))
- message: key must not be empty
rule: self.all(key, key.size() != 0)
type: object
Expand All @@ -3791,12 +3787,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -3813,6 +3803,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down Expand Up @@ -5672,14 +5664,14 @@ spec:
type: string
x-kubernetes-validations:
- message: wildcard not allowed in label value match
rule: '!self.contains("*")'
rule: '!self.contains(''*'')'
description: One or more labels that indicate a specific set of
pods/VMs on which a policy should be applied.
maxProperties: 4096
type: object
x-kubernetes-validations:
- message: wildcard not allowed in label key match
rule: self.all(key, !key.contains("*"))
rule: self.all(key, !key.contains('*'))
- message: key must not be empty
rule: self.all(key, key.size() != 0)
type: object
Expand All @@ -5705,12 +5697,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -5727,6 +5713,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down
18 changes: 6 additions & 12 deletions bundle/manifests/networking.istio.io_envoyfilters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,8 @@ spec:
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"]]'
rule: '[self.group, self.kind] in [[''core'',''Service''], ['''',''Service''],
[''gateway.networking.k8s.io'',''Gateway''], [''networking.istio.io'',''ServiceEntry'']]'
maxItems: 16
type: array
workloadSelector:
Expand All @@ -317,7 +316,7 @@ spec:
type: string
x-kubernetes-validations:
- message: wildcard is not supported in selector
rule: '!self.contains("*")'
rule: '!self.contains(''*'')'
description: One or more labels that indicate a specific set of
pods/VMs on which the configuration should be applied.
maxProperties: 256
Expand All @@ -326,8 +325,7 @@ spec:
type: object
x-kubernetes-validations:
- message: only one of targetRefs or workloadSelector can be set
rule: '(has(self.workloadSelector) ? 1 : 0) + (has(self.targetRefs)
? 1 : 0) <= 1'
rule: (has(self.workloadSelector)?1:0)+(has(self.targetRefs)?1:0)<=1
status:
properties:
conditions:
Expand All @@ -347,12 +345,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -369,6 +361,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down
24 changes: 6 additions & 18 deletions bundle/manifests/networking.istio.io_gateways.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -218,6 +212,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down Expand Up @@ -429,12 +425,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -451,6 +441,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down Expand Up @@ -662,12 +654,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -684,6 +670,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down
12 changes: 4 additions & 8 deletions bundle/manifests/networking.istio.io_proxyconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ spec:
type: string
x-kubernetes-validations:
- message: wildcard not allowed in label value match
rule: '!self.contains("*")'
rule: '!self.contains(''*'')'
description: One or more labels that indicate a specific set of
pods/VMs on which a policy should be applied.
maxProperties: 4096
type: object
x-kubernetes-validations:
- message: wildcard not allowed in label key match
rule: self.all(key, !key.contains("*"))
rule: self.all(key, !key.contains('*'))
- message: key must not be empty
rule: self.all(key, key.size() != 0)
type: object
Expand All @@ -89,12 +89,6 @@ spec:
description: Human-readable message indicating details about
last transition.
type: string
observedGeneration:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Condition refers.
x-kubernetes-int-or-string: true
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
Expand All @@ -111,6 +105,8 @@ spec:
anyOf:
- type: integer
- type: string
description: Resource Generation to which the Reconciled Condition
refers.
x-kubernetes-int-or-string: true
validationMessages:
description: Includes any errors or warnings detected by Istio's analyzers.
Expand Down
Loading