Skip to content

Commit 83a55d9

Browse files
committed
update istio/istio
Signed-off-by: Sebastian Hoß <[email protected]>
1 parent 6a0746d commit 83a55d9

File tree

66 files changed

+1541
-367
lines changed

Some content is hidden

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

66 files changed

+1541
-367
lines changed

code-generator/src/catalog.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,8 +1730,7 @@ pub const CRD_V1_SOURCES: &'static [UpstreamSource] = &[
17301730
project_name: "istio/istio",
17311731
license: APACHE_V2,
17321732
urls: &[
1733-
"https://github.com/istio/istio/blob/master/manifests/charts/base/crds/crd-all.gen.yaml",
1734-
"https://github.com/istio/istio/blob/master/manifests/charts/istio-operator/crds/crd-operator.yaml",
1733+
"https://github.com/istio/istio/blob/master/manifests/charts/base/files/crd-all.gen.yaml",
17351734
],
17361735
ignores: &[],
17371736
},
@@ -1835,8 +1834,8 @@ pub const CRD_V1_SOURCES: &'static [UpstreamSource] = &[
18351834
project_name: "keycloak/keycloak-k8s-resources",
18361835
license: APACHE_V2,
18371836
urls: &[
1838-
"https://github.com/keycloak/keycloak-k8s-resources/blob/main/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml",
1839-
"https://github.com/keycloak/keycloak-k8s-resources/blob/main/kubernetes/keycloaks.k8s.keycloak.org-v1.yml",
1837+
"https://github.com/keycloak/keycloak-k8s-resources/blob/nightly/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml",
1838+
"https://github.com/keycloak/keycloak-k8s-resources/blob/nightly/kubernetes/keycloaks.k8s.keycloak.org-v1.yml",
18401839
],
18411840
ignores: &[],
18421841
},

crd-catalog/istio/istio/extensions.istio.io/v1alpha1/wasmplugins.yaml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ spec:
111111
type: "string"
112112
x-kubernetes-validations:
113113
- message: "wildcard not allowed in label value match"
114-
rule: "!self.contains('*')"
114+
rule: "!self.contains(\"*\")"
115115
description: "One or more labels that indicate a specific set of pods/VMs on which a policy should be applied."
116116
maxProperties: 4096
117117
type: "object"
118118
x-kubernetes-validations:
119119
- message: "wildcard not allowed in label key match"
120-
rule: "self.all(key, !key.contains('*'))"
120+
rule: "self.all(key, !key.contains(\"*\"))"
121121
- message: "key must not be empty"
122122
rule: "self.all(key, key.size() != 0)"
123123
type: "object"
@@ -153,9 +153,6 @@ spec:
153153
- "kind"
154154
- "name"
155155
type: "object"
156-
x-kubernetes-validations:
157-
- message: "Support kinds are core/Service, networking.istio.io/ServiceEntry, gateway.networking.k8s.io/Gateway"
158-
rule: "[self.group, self.kind] in [['core','Service'], ['','Service'], ['gateway.networking.k8s.io','Gateway'], ['networking.istio.io','ServiceEntry']]"
159156
targetRefs:
160157
description: "Optional."
161158
items:
@@ -186,9 +183,6 @@ spec:
186183
- "kind"
187184
- "name"
188185
type: "object"
189-
x-kubernetes-validations:
190-
- message: "Support kinds are core/Service, networking.istio.io/ServiceEntry, gateway.networking.k8s.io/Gateway"
191-
rule: "[self.group, self.kind] in [['core','Service'], ['','Service'], ['gateway.networking.k8s.io','Gateway'], ['networking.istio.io','ServiceEntry']]"
192186
maxItems: 16
193187
type: "array"
194188
type:
@@ -204,7 +198,7 @@ spec:
204198
type: "string"
205199
x-kubernetes-validations:
206200
- message: "url must have schema one of [http, https, file, oci]"
207-
rule: "isURL(self) ? (url(self).getScheme() in ['', 'http', 'https', 'oci', 'file']) : (isURL('http://' + self) && url('http://' +self).getScheme() in ['', 'http', 'https', 'oci', 'file'])"
201+
rule: "isURL(self) ? (url(self).getScheme() in [\"\", \"http\", \"https\", \"oci\", \"file\"]) : (isURL(\"http://\" + self) &&\nurl(\"http://\" + self).getScheme() in [\"\", \"http\", \"https\", \"oci\", \"file\"])"
208202
verificationKey:
209203
type: "string"
210204
vmConfig:
@@ -234,7 +228,7 @@ spec:
234228
type: "object"
235229
x-kubernetes-validations:
236230
- message: "value may only be set when valueFrom is INLINE"
237-
rule: "(has(self.valueFrom) ? self.valueFrom : '') != 'HOST' || !has(self.value)"
231+
rule: "(has(self.valueFrom) ? self.valueFrom : \"\") != \"HOST\" || !has(self.value)"
238232
maxItems: 256
239233
type: "array"
240234
x-kubernetes-list-map-keys:
@@ -246,7 +240,7 @@ spec:
246240
type: "object"
247241
x-kubernetes-validations:
248242
- message: "only one of targetRefs or selector can be set"
249-
rule: "(has(self.selector)?1:0)+(has(self.targetRef)?1:0)+(has(self.targetRefs)?1:0)<=1"
243+
rule: "(has(self.selector) ? 1 : 0) + (has(self.targetRef) ? 1 : 0) + (has(self.targetRefs) ? 1 : 0) <= 1"
250244
status:
251245
properties:
252246
conditions:
@@ -264,6 +258,12 @@ spec:
264258
message:
265259
description: "Human-readable message indicating details about last transition."
266260
type: "string"
261+
observedGeneration:
262+
anyOf:
263+
- type: "integer"
264+
- type: "string"
265+
description: "Resource Generation to which the Condition refers."
266+
x-kubernetes-int-or-string: true
267267
reason:
268268
description: "Unique, one-word, CamelCase reason for the condition's last transition."
269269
type: "string"
@@ -279,7 +279,6 @@ spec:
279279
anyOf:
280280
- type: "integer"
281281
- type: "string"
282-
description: "Resource Generation to which the Reconciled Condition refers."
283282
x-kubernetes-int-or-string: true
284283
validationMessages:
285284
description: "Includes any errors or warnings detected by Istio's analyzers."

0 commit comments

Comments
 (0)