Skip to content

Commit e910fdd

Browse files
Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#532)
Signed-off-by: openshift-service-mesh-bot <[email protected]>
1 parent 7aadd86 commit e910fdd

File tree

51 files changed

+1191
-967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1191
-967
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "istio build-tools",
3-
"image": "gcr.io/istio-testing/build-tools:master-f53c293f26fde9fd818b2ddc22dc3836dd58103e",
3+
"image": "gcr.io/istio-testing/build-tools:master-0b8e6b9676d328fbeb28a23b8d1134dcc56d98ec",
44
"privileged": true,
55
"remoteEnv": {
66
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

.github/workflows/update-deps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
update-deps:
2424
runs-on: ubuntu-latest
2525
container:
26-
image: gcr.io/istio-testing/build-tools:master-f53c293f26fde9fd818b2ddc22dc3836dd58103e
26+
image: gcr.io/istio-testing/build-tools:master-0b8e6b9676d328fbeb28a23b8d1134dcc56d98ec
2727
options: --entrypoint ''
2828

2929
steps:

Makefile.core.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ ISTIOCTL ?= $(LOCALBIN)/istioctl
469469

470470
## Tool Versions
471471
OPERATOR_SDK_VERSION ?= v1.38.0
472-
HELM_VERSION ?= v3.16.3
472+
HELM_VERSION ?= v3.16.4
473473
CONTROLLER_TOOLS_VERSION ?= v0.16.5
474474
OPM_VERSION ?= v1.48.0
475475
OLM_VERSION ?= v0.30.0

bundle/manifests/extensions.istio.io_wasmplugins.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ spec:
133133
type: string
134134
x-kubernetes-validations:
135135
- message: wildcard not allowed in label value match
136-
rule: '!self.contains(''*'')'
136+
rule: '!self.contains("*")'
137137
description: One or more labels that indicate a specific set of
138138
pods/VMs on which a policy should be applied.
139139
maxProperties: 4096
140140
type: object
141141
x-kubernetes-validations:
142142
- message: wildcard not allowed in label key match
143-
rule: self.all(key, !key.contains('*'))
143+
rule: self.all(key, !key.contains("*"))
144144
- message: key must not be empty
145145
rule: self.all(key, key.size() != 0)
146146
type: object
@@ -180,8 +180,9 @@ spec:
180180
x-kubernetes-validations:
181181
- message: Support kinds are core/Service, networking.istio.io/ServiceEntry,
182182
gateway.networking.k8s.io/Gateway
183-
rule: '[self.group, self.kind] in [[''core'',''Service''], ['''',''Service''],
184-
[''gateway.networking.k8s.io'',''Gateway''], [''networking.istio.io'',''ServiceEntry'']]'
183+
rule: '[self.group, self.kind] in [["core", "Service"], ["", "Service"],
184+
["gateway.networking.k8s.io", "Gateway"], ["networking.istio.io",
185+
"ServiceEntry"]]'
185186
targetRefs:
186187
description: Optional.
187188
items:
@@ -215,8 +216,9 @@ spec:
215216
x-kubernetes-validations:
216217
- message: Support kinds are core/Service, networking.istio.io/ServiceEntry,
217218
gateway.networking.k8s.io/Gateway
218-
rule: '[self.group, self.kind] in [[''core'',''Service''], ['''',''Service''],
219-
[''gateway.networking.k8s.io'',''Gateway''], [''networking.istio.io'',''ServiceEntry'']]'
219+
rule: '[self.group, self.kind] in [["core", "Service"], ["", "Service"],
220+
["gateway.networking.k8s.io", "Gateway"], ["networking.istio.io",
221+
"ServiceEntry"]]'
220222
maxItems: 16
221223
type: array
222224
type:
@@ -235,10 +237,9 @@ spec:
235237
type: string
236238
x-kubernetes-validations:
237239
- message: url must have schema one of [http, https, file, oci]
238-
rule: 'isURL(self) ? (url(self).getScheme() in ['''', ''http'',
239-
''https'', ''oci'', ''file'']) : (isURL(''http://'' + self) &&
240-
url(''http://'' +self).getScheme() in ['''', ''http'', ''https'',
241-
''oci'', ''file''])'
240+
rule: |-
241+
isURL(self) ? (url(self).getScheme() in ["", "http", "https", "oci", "file"]) : (isURL("http://" + self) &&
242+
url("http://" + self).getScheme() in ["", "http", "https", "oci", "file"])
242243
verificationKey:
243244
type: string
244245
vmConfig:
@@ -272,7 +273,7 @@ spec:
272273
type: object
273274
x-kubernetes-validations:
274275
- message: value may only be set when valueFrom is INLINE
275-
rule: '(has(self.valueFrom) ? self.valueFrom : '''') != ''HOST''
276+
rule: '(has(self.valueFrom) ? self.valueFrom : "") != "HOST"
276277
|| !has(self.value)'
277278
maxItems: 256
278279
type: array
@@ -285,7 +286,8 @@ spec:
285286
type: object
286287
x-kubernetes-validations:
287288
- message: only one of targetRefs or selector can be set
288-
rule: (has(self.selector)?1:0)+(has(self.targetRef)?1:0)+(has(self.targetRefs)?1:0)<=1
289+
rule: '(has(self.selector) ? 1 : 0) + (has(self.targetRef) ? 1 : 0)
290+
+ (has(self.targetRefs) ? 1 : 0) <= 1'
289291
status:
290292
properties:
291293
conditions:

bundle/manifests/networking.istio.io_destinationrules.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,14 +1844,14 @@ spec:
18441844
type: string
18451845
x-kubernetes-validations:
18461846
- message: wildcard not allowed in label value match
1847-
rule: '!self.contains(''*'')'
1847+
rule: '!self.contains("*")'
18481848
description: One or more labels that indicate a specific set of
18491849
pods/VMs on which a policy should be applied.
18501850
maxProperties: 4096
18511851
type: object
18521852
x-kubernetes-validations:
18531853
- message: wildcard not allowed in label key match
1854-
rule: self.all(key, !key.contains('*'))
1854+
rule: self.all(key, !key.contains("*"))
18551855
- message: key must not be empty
18561856
rule: self.all(key, key.size() != 0)
18571857
type: object
@@ -3758,14 +3758,14 @@ spec:
37583758
type: string
37593759
x-kubernetes-validations:
37603760
- message: wildcard not allowed in label value match
3761-
rule: '!self.contains(''*'')'
3761+
rule: '!self.contains("*")'
37623762
description: One or more labels that indicate a specific set of
37633763
pods/VMs on which a policy should be applied.
37643764
maxProperties: 4096
37653765
type: object
37663766
x-kubernetes-validations:
37673767
- message: wildcard not allowed in label key match
3768-
rule: self.all(key, !key.contains('*'))
3768+
rule: self.all(key, !key.contains("*"))
37693769
- message: key must not be empty
37703770
rule: self.all(key, key.size() != 0)
37713771
type: object
@@ -5672,14 +5672,14 @@ spec:
56725672
type: string
56735673
x-kubernetes-validations:
56745674
- message: wildcard not allowed in label value match
5675-
rule: '!self.contains(''*'')'
5675+
rule: '!self.contains("*")'
56765676
description: One or more labels that indicate a specific set of
56775677
pods/VMs on which a policy should be applied.
56785678
maxProperties: 4096
56795679
type: object
56805680
x-kubernetes-validations:
56815681
- message: wildcard not allowed in label key match
5682-
rule: self.all(key, !key.contains('*'))
5682+
rule: self.all(key, !key.contains("*"))
56835683
- message: key must not be empty
56845684
rule: self.all(key, key.size() != 0)
56855685
type: object

bundle/manifests/networking.istio.io_envoyfilters.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,9 @@ spec:
302302
x-kubernetes-validations:
303303
- message: Support kinds are core/Service, networking.istio.io/ServiceEntry,
304304
gateway.networking.k8s.io/Gateway
305-
rule: '[self.group, self.kind] in [[''core'',''Service''], ['''',''Service''],
306-
[''gateway.networking.k8s.io'',''Gateway''], [''networking.istio.io'',''ServiceEntry'']]'
305+
rule: '[self.group, self.kind] in [["core", "Service"], ["", "Service"],
306+
["gateway.networking.k8s.io", "Gateway"], ["networking.istio.io",
307+
"ServiceEntry"]]'
307308
maxItems: 16
308309
type: array
309310
workloadSelector:
@@ -316,7 +317,7 @@ spec:
316317
type: string
317318
x-kubernetes-validations:
318319
- message: wildcard is not supported in selector
319-
rule: '!self.contains(''*'')'
320+
rule: '!self.contains("*")'
320321
description: One or more labels that indicate a specific set of
321322
pods/VMs on which the configuration should be applied.
322323
maxProperties: 256
@@ -325,7 +326,8 @@ spec:
325326
type: object
326327
x-kubernetes-validations:
327328
- message: only one of targetRefs or workloadSelector can be set
328-
rule: (has(self.workloadSelector)?1:0)+(has(self.targetRefs)?1:0)<=1
329+
rule: '(has(self.workloadSelector) ? 1 : 0) + (has(self.targetRefs)
330+
? 1 : 0) <= 1'
329331
status:
330332
properties:
331333
conditions:

bundle/manifests/networking.istio.io_proxyconfigs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ spec:
5858
type: string
5959
x-kubernetes-validations:
6060
- message: wildcard not allowed in label value match
61-
rule: '!self.contains(''*'')'
61+
rule: '!self.contains("*")'
6262
description: One or more labels that indicate a specific set of
6363
pods/VMs on which a policy should be applied.
6464
maxProperties: 4096
6565
type: object
6666
x-kubernetes-validations:
6767
- message: wildcard not allowed in label key match
68-
rule: self.all(key, !key.contains('*'))
68+
rule: self.all(key, !key.contains("*"))
6969
- message: key must not be empty
7070
rule: self.all(key, key.size() != 0)
7171
type: object

0 commit comments

Comments
 (0)