chore(deps): bump github.com/kong/kubernetes-configuration from 0.0.4…

…5 to 0.0.46 (#868) * chore(deps): bump github.com/kong/kubernetes-configuration Bumps [github.com/kong/kubernetes-configuration](https://github.com/kong/kubernetes-configuration) from 0.0.45 to 0.0.46. - [Commits](Kong/kubernetes-configuration@v0.0.45...v0.0.46) --- updated-dependencies: - dependency-name: github.com/kong/kubernetes-configuration dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * chore: regenerate --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]>
Kong · Nov 22, 2024 · 88b839f · 88b839f
1 parent dc5bc96
commit 88b839f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/config/crd/bases/gateway-operator.konghq.com_konnectextensions.yaml b/config/crd/bases/gateway-operator.konghq.com_konnectextensions.yaml
@@ -79,41 +79,48 @@ spec:
                     - name
                     type: object
                   type:
+                    default: kic
                     description: |-
-                      Type can be one of:
+                      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
-                required:
-                - type
                 type: object
                 x-kubernetes-validations:
                 - message: Only konnectID type currently supported as controlPlaneRef.
                   rule: self.type == 'konnectID'
                 - message: when type is konnectNamespacedRef, konnectNamespacedRef
                     must be set
-                  rule: 'self.type == ''konnectNamespacedRef'' ? has(self.konnectNamespacedRef)
-                    : true'
+                  rule: '(has(self.type) && self.type == ''konnectNamespacedRef'')
+                    ? has(self.konnectNamespacedRef) : true'
                 - message: when type is konnectNamespacedRef, konnectID must not be
                     set
-                  rule: 'self.type == ''konnectNamespacedRef'' ? !has(self.konnectID)
-                    : true'
+                  rule: '(has(self.type) && self.type == ''konnectNamespacedRef'')
+                    ? !has(self.konnectID) : true'
                 - message: when type is konnectID, konnectID must be set
-                  rule: 'self.type == ''konnectID'' ? has(self.konnectID) : true'
+                  rule: '(has(self.type) && self.type == ''konnectID'') ? has(self.konnectID)
+                    : true'
                 - message: when type is konnectID, konnectNamespacedRef must not be
                     set
-                  rule: 'self.type == ''konnectID'' ? !has(self.konnectNamespacedRef)
+                  rule: '(has(self.type) && self.type == ''konnectID'') ? !has(self.konnectNamespacedRef)
                     : true'
                 - message: when type is kic, konnectID must not be set
-                  rule: 'self.type == ''kic'' ? !has(self.konnectID) : true'
+                  rule: '(has(self.type) && self.type == ''kic'') ? !has(self.konnectID)
+                    : true'
                 - message: when type is kic, konnectNamespacedRef must not be set
-                  rule: 'self.type == ''kic'' ? !has(self.konnectNamespacedRef) :
-                    true'
+                  rule: '(has(self.type) && self.type == ''kic'') ? !has(self.konnectNamespacedRef)
+                    : true'
+                - message: when type is unset, konnectID must not be set
+                  rule: '!has(self.type) ? !has(self.konnectID) : true'
+                - message: when type is unset, konnectNamespacedRef must not be set
+                  rule: '!has(self.type) ? !has(self.konnectNamespacedRef) : true'
               controlPlaneRegion:
                 description: ControlPlaneRegion is the region of the Konnect Control
                   Plane.

diff --git a/controller/konnect/reconciler_kongplugin.go b/controller/konnect/reconciler_kongplugin.go
@@ -147,8 +147,7 @@ func (r *KongPluginReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 				WithControlPlaneRef(&configurationv1alpha1.ControlPlaneRef{
 					Type: configurationv1alpha1.ControlPlaneRefKonnectNamespacedRef,
 					KonnectNamespacedRef: &configurationv1alpha1.KonnectNamespacedRef{
-						Namespace: cpNN.Namespace,
-						Name:      cpNN.Name,
+						Name: cpNN.Name,
 					},
 				})
 

diff --git a/docs/api-reference.md b/docs/api-reference.md
@@ -478,7 +478,7 @@ It is used to reference a Control Plane entity.
 
 | Field | Description |
 | --- | --- |
-| `type` _string_ | Type can be one of: - konnectID - konnectNamespacedRef - kic |
+| `type` _string_ | Type indicates the type of the control plane being referenced. Allowed values: - konnectID - konnectNamespacedRef - kic<br /><br /> The default is kic, which implies that the Control Plane is KIC. |
 | `konnectID` _string_ | KonnectID is the schema for the KonnectID type. This field is required when the Type is konnectID. |
 | `konnectNamespacedRef` _[KonnectNamespacedRef](#konnectnamespacedref)_ | KonnectNamespacedRef is a reference to a Konnect Control Plane entity inside the cluster. It contains the name of the Konnect Control Plane. This field is required when the Type is konnectNamespacedRef. |
 

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-containerregistry v0.20.2
 	github.com/google/uuid v1.6.0
-	github.com/kong/kubernetes-configuration v0.0.45
+	github.com/kong/kubernetes-configuration v0.0.46
 	github.com/kong/kubernetes-telemetry v0.1.7
 	github.com/kong/kubernetes-testing-framework v0.47.2
 	github.com/kong/semver/v4 v4.0.1

diff --git a/go.sum b/go.sum
@@ -218,8 +218,8 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kong/go-kong v0.59.1 h1:AJZtyCD+Zyqe/mF/m+x3/qN/GPVxAH7jq9zGJTHRfjc=
 github.com/kong/go-kong v0.59.1/go.mod h1:8Vt6HmtgLNgL/7bSwAlz3DIWqBtzG7qEt9+OnMiQOa0=
-github.com/kong/kubernetes-configuration v0.0.45 h1:cw5G2aSNI0pBXOyy/DkgiCr/K/ofcsn7zmuGQwNcWg8=
-github.com/kong/kubernetes-configuration v0.0.45/go.mod h1:Bk0H032d+aPgVYakc7C9Zo5nLwiXXm9thKUWF8vvisA=
+github.com/kong/kubernetes-configuration v0.0.46 h1:dIxVu9dOtGi9aY2prTlQ1CkiSu8Fk/0oal9m9iiUdSk=
+github.com/kong/kubernetes-configuration v0.0.46/go.mod h1:Bk0H032d+aPgVYakc7C9Zo5nLwiXXm9thKUWF8vvisA=
 github.com/kong/kubernetes-telemetry v0.1.7 h1:R4NUpvbF5uZ+5kgSQsIcf/oulRBGQCHsffFRDE4wxV4=
 github.com/kong/kubernetes-telemetry v0.1.7/go.mod h1:USy5pcD1+Mm9NtKuz3Pb/rSx71VN76gHCFhdbAB4/lg=
 github.com/kong/kubernetes-testing-framework v0.47.2 h1:+2Z9anTpbV/hwNeN+NFQz53BMU+g3QJydkweBp3tULo=