From 5303951530a6fde00e67a2b2f5a40ca23b3794d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Burzy=C5=84ski?= Date: Wed, 22 Jan 2025 09:59:43 +0100 Subject: [PATCH] chore(deps): bump kong/kubernetes-configuration to v1.1.0 --- charts/gateway-operator/CHANGELOG.md | 7 ++ .../kubernetes-configuration-crds/Chart.yaml | 4 +- .../crds/kubernetes-configuration-crds.yaml | 106 ++++++++++++------ 3 files changed, 81 insertions(+), 36 deletions(-) diff --git a/charts/gateway-operator/CHANGELOG.md b/charts/gateway-operator/CHANGELOG.md index 90aebd901..0e497318c 100644 --- a/charts/gateway-operator/CHANGELOG.md +++ b/charts/gateway-operator/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Unreleased + +### Changes + +- Bumped `kong/kubernetes-configuration` CRDs to 1.1.0. + [#1267]( + ## 0.4.4 ### Changes diff --git a/charts/gateway-operator/charts/kubernetes-configuration-crds/Chart.yaml b/charts/gateway-operator/charts/kubernetes-configuration-crds/Chart.yaml index 8aed9edd8..fe394af63 100644 --- a/charts/gateway-operator/charts/kubernetes-configuration-crds/Chart.yaml +++ b/charts/gateway-operator/charts/kubernetes-configuration-crds/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 name: kubernetes-configuration-crds -version: 1.0.3 -appVersion: "1.0.3" +version: 1.1.0 +appVersion: "1.1.0" description: A Helm chart for Kong's Kubernetes Configuration CRDs diff --git a/charts/gateway-operator/charts/kubernetes-configuration-crds/crds/kubernetes-configuration-crds.yaml b/charts/gateway-operator/charts/kubernetes-configuration-crds/crds/kubernetes-configuration-crds.yaml index 1908740af..0c7d93376 100644 --- a/charts/gateway-operator/charts/kubernetes-configuration-crds/crds/kubernetes-configuration-crds.yaml +++ b/charts/gateway-operator/charts/kubernetes-configuration-crds/crds/kubernetes-configuration-crds.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongcacertificates.configuration.konghq.com spec: group: configuration.konghq.com @@ -79,11 +79,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -247,7 +249,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongcertificates.configuration.konghq.com spec: group: configuration.konghq.com @@ -329,11 +331,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -508,7 +512,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: ingress-controller,gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongconsumergroups.configuration.konghq.com spec: group: configuration.konghq.com @@ -586,11 +590,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -754,7 +760,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: ingress-controller,gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongconsumers.configuration.konghq.com spec: group: configuration.konghq.com @@ -857,11 +863,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -1027,7 +1035,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongcredentialacls.configuration.konghq.com spec: group: configuration.konghq.com @@ -1215,7 +1223,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongcredentialapikeys.configuration.konghq.com spec: group: configuration.konghq.com @@ -1403,7 +1411,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongcredentialbasicauths.configuration.konghq.com spec: group: configuration.konghq.com @@ -1595,7 +1603,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongcredentialhmacs.configuration.konghq.com spec: group: configuration.konghq.com @@ -1789,7 +1797,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongcredentialjwts.configuration.konghq.com spec: group: configuration.konghq.com @@ -2007,7 +2015,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongdataplaneclientcertificates.configuration.konghq.com spec: group: configuration.konghq.com @@ -2085,11 +2093,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -2249,7 +2259,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongkeys.configuration.konghq.com spec: group: configuration.konghq.com @@ -2321,11 +2331,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -2385,15 +2397,13 @@ spec: - name type: object type: - allOf: - - enum: - - konnectID - - namespacedRef - - enum: - - namespacedRef description: |- Type defines type of the KeySet object reference. It can be one of: + - konnectID - namespacedRef + enum: + - konnectID + - namespacedRef type: string required: - type @@ -2402,6 +2412,8 @@ spec: - message: when type is namespacedRef, namespacedRef must be set rule: 'self.type == ''namespacedRef'' ? has(self.namespacedRef) : true' + - message: when type is konnectID, konnectID must be set + rule: 'self.type == ''konnectID'' ? has(self.konnectID) : true' kid: description: |- KID is a unique identifier for a key. @@ -2568,7 +2580,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongkeysets.configuration.konghq.com spec: group: configuration.konghq.com @@ -2640,11 +2652,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -2811,7 +2825,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: ingress-controller,gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: konglicenses.configuration.konghq.com spec: group: configuration.konghq.com @@ -3010,7 +3024,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongpluginbindings.configuration.konghq.com spec: group: configuration.konghq.com @@ -3090,11 +3104,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -3147,6 +3163,13 @@ spec: x-kubernetes-validations: - message: pluginRef name must be set rule: self.name != '' + scope: + default: OnlyTargets + description: Scope defines the scope of the plugin binding. + enum: + - OnlyTargets + - GlobalInControlPlane + type: string targets: description: |- Targets contains the targets references. It is possible to set multiple combinations @@ -3267,9 +3290,6 @@ spec: x-kubernetes-validations: - message: Cannot set Consumer and ConsumerGroup at the same time rule: '(has(self.consumerRef) ? !has(self.consumerGroupRef) : true)' - - message: At least one entity reference must be set - rule: has(self.routeRef) || has(self.serviceRef) || has(self.consumerRef) - || has(self.consumerGroupRef) - message: KongRoute can be used only when serviceRef is unset or set to KongService rule: '(has(self.routeRef) && self.routeRef.kind == ''KongRoute'') @@ -3281,9 +3301,17 @@ spec: ? (!has(self.routeRef) || self.routeRef.kind == ''KongRoute'') : true' required: + - controlPlaneRef - pluginRef - - targets type: object + x-kubernetes-validations: + - message: At least one target reference must be set when scope is 'OnlyTargets' + rule: 'self.scope == ''OnlyTargets'' ? has(self.targets) && (has(self.targets.routeRef) + || has(self.targets.serviceRef) || has(self.targets.consumerRef) || + has(self.targets.consumerGroupRef)) : true' + - message: No targets must be set when scope is 'GlobalInControlPlane' + rule: 'self.scope == ''GlobalInControlPlane'' ? !has(self.targets) : + true' status: default: conditions: @@ -3401,7 +3429,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: ingress-controller,gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongplugins.configuration.konghq.com spec: group: configuration.konghq.com @@ -3702,7 +3730,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongroutes.configuration.konghq.com spec: group: configuration.konghq.com @@ -3775,11 +3803,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -3825,7 +3855,9 @@ spec: type: array headers: additionalProperties: - type: string + items: + type: string + type: array description: 'One or more lists of values indexed by header name that will cause this Route to match if present in the request. The `Host` header cannot be used with this attribute: hosts should be specified @@ -4102,7 +4134,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongservices.configuration.konghq.com spec: group: configuration.konghq.com @@ -4187,11 +4219,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -4407,7 +4441,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongsnis.configuration.konghq.com spec: group: configuration.konghq.com @@ -4593,7 +4627,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongtargets.configuration.konghq.com spec: group: configuration.konghq.com @@ -4784,7 +4818,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongupstreams.configuration.konghq.com spec: group: configuration.konghq.com @@ -4866,11 +4900,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -5220,7 +5256,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: ingress-controller,gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: kongvaults.configuration.konghq.com spec: group: configuration.konghq.com @@ -5325,11 +5361,13 @@ spec: default: kic description: |- Type indicates the type of the control plane being referenced. Allowed values: + - konnectID - konnectNamespacedRef - kic The default is kic, which implies that the Control Plane is KIC. enum: + - konnectID - konnectNamespacedRef - kic type: string @@ -5505,7 +5543,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: konnectapiauthconfigurations.konnect.konghq.com spec: group: konnect.konghq.com @@ -5707,7 +5745,7 @@ kind: CustomResourceDefinition metadata: annotations: kubernetes-configuration.konghq.com/channels: gateway-operator - kubernetes-configuration.konghq.com/version: v1.0.3 + kubernetes-configuration.konghq.com/version: v1.1.0 name: konnectgatewaycontrolplanes.konnect.konghq.com spec: group: konnect.konghq.com