diff --git a/api/configuration/v1alpha1/controlplaneref_types.go b/api/configuration/v1alpha1/controlplaneref_types.go
index 3b2822fc..8fecea5e 100644
--- a/api/configuration/v1alpha1/controlplaneref_types.go
+++ b/api/configuration/v1alpha1/controlplaneref_types.go
@@ -26,12 +26,13 @@ const (
// +apireference:kgo:include
type ControlPlaneRef struct {
// 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.
//
- // +kubebuilder:validation:Enum=konnectNamespacedRef;kic
+ // +kubebuilder:validation:Enum=konnectID;konnectNamespacedRef;kic
// +kubebuilder:default:=kic
Type string `json:"type,omitempty"`
diff --git a/api/configuration/v1alpha1/key_set_ref.go b/api/configuration/v1alpha1/key_set_ref.go
index da4dbf93..4db773a1 100644
--- a/api/configuration/v1alpha1/key_set_ref.go
+++ b/api/configuration/v1alpha1/key_set_ref.go
@@ -19,13 +19,13 @@ const (
// KeySetRef is the schema for the KeySetRef type.
// It is used to reference a KeySet entity.
// +kubebuilder:validation:XValidation:rule="self.type == 'namespacedRef' ? has(self.namespacedRef) : true", message="when type is namespacedRef, namespacedRef must be set"
+// +kubebuilder:validation:XValidation:rule="self.type == 'konnectID' ? has(self.konnectID) : true", message="when type is konnectID, konnectID must be set"
// +apireference:kgo:include
// +kong:channels=gateway-operator
type KeySetRef struct {
// Type defines type of the KeySet object reference. It can be one of:
+ // - konnectID
// - namespacedRef
- //
- // +kubebuilder:validation:Enum=namespacedRef
Type KeySetRefType `json:"type"`
// KonnectID is the schema for the KonnectID type.
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongcacertificates.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongcacertificates.yaml
index ec62a3dd..0c227de7 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongcacertificates.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongcacertificates.yaml
@@ -80,11 +80,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongcertificates.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongcertificates.yaml
index 07ea2870..5c14cc1a 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongcertificates.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongcertificates.yaml
@@ -86,11 +86,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongconsumergroups.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongconsumergroups.yaml
index c9546d1b..2518d873 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongconsumergroups.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongconsumergroups.yaml
@@ -82,11 +82,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongconsumers.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongconsumers.yaml
index 63905156..c9efdd2b 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongconsumers.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongconsumers.yaml
@@ -107,11 +107,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongdataplaneclientcertificates.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongdataplaneclientcertificates.yaml
index d914d435..0bb5dbaf 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongdataplaneclientcertificates.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongdataplaneclientcertificates.yaml
@@ -82,11 +82,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongkeys.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongkeys.yaml
index 075c1ffa..0053f949 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongkeys.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongkeys.yaml
@@ -76,11 +76,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
@@ -140,15 +142,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
@@ -157,6 +157,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.
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongkeysets.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongkeysets.yaml
index 2cc28d82..99d06639 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongkeysets.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongkeysets.yaml
@@ -76,11 +76,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongpluginbindings.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongpluginbindings.yaml
index 691d099f..23bbc074 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongpluginbindings.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongpluginbindings.yaml
@@ -84,11 +84,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongroutes.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongroutes.yaml
index d9f59404..7f2824b9 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongroutes.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongroutes.yaml
@@ -77,11 +77,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongservices.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongservices.yaml
index 2b3ad212..9ff3813b 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongservices.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongservices.yaml
@@ -89,11 +89,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongupstreams.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongupstreams.yaml
index d8a4b9cf..9c022a96 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongupstreams.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongupstreams.yaml
@@ -86,11 +86,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
diff --git a/config/crd/gateway-operator/configuration.konghq.com_kongvaults.yaml b/config/crd/gateway-operator/configuration.konghq.com_kongvaults.yaml
index 3ef28977..2047a570 100644
--- a/config/crd/gateway-operator/configuration.konghq.com_kongvaults.yaml
+++ b/config/crd/gateway-operator/configuration.konghq.com_kongvaults.yaml
@@ -109,11 +109,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
diff --git a/config/crd/ingress-controller/configuration.konghq.com_kongconsumergroups.yaml b/config/crd/ingress-controller/configuration.konghq.com_kongconsumergroups.yaml
index c9546d1b..2518d873 100644
--- a/config/crd/ingress-controller/configuration.konghq.com_kongconsumergroups.yaml
+++ b/config/crd/ingress-controller/configuration.konghq.com_kongconsumergroups.yaml
@@ -82,11 +82,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
diff --git a/config/crd/ingress-controller/configuration.konghq.com_kongconsumers.yaml b/config/crd/ingress-controller/configuration.konghq.com_kongconsumers.yaml
index 63905156..c9efdd2b 100644
--- a/config/crd/ingress-controller/configuration.konghq.com_kongconsumers.yaml
+++ b/config/crd/ingress-controller/configuration.konghq.com_kongconsumers.yaml
@@ -107,11 +107,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
diff --git a/config/crd/ingress-controller/configuration.konghq.com_kongvaults.yaml b/config/crd/ingress-controller/configuration.konghq.com_kongvaults.yaml
index 3ef28977..2047a570 100644
--- a/config/crd/ingress-controller/configuration.konghq.com_kongvaults.yaml
+++ b/config/crd/ingress-controller/configuration.konghq.com_kongvaults.yaml
@@ -109,11 +109,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
diff --git a/docs/api-reference.md b/docs/api-reference.md
index 64d538a8..051fa1b3 100644
--- a/docs/api-reference.md
+++ b/docs/api-reference.md
@@ -685,7 +685,7 @@ It is used to reference a Control Plane entity.
| Field | Description |
| --- | --- |
-| `type` _string_ | Type indicates the type of the control plane being referenced. Allowed values: - konnectNamespacedRef - kic<br /><br /> The default is kic, which implies that the Control Plane is 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. |
@@ -776,7 +776,7 @@ It is used to reference a KeySet entity.
| Field | Description |
| --- | --- |
-| `type` _[KeySetRefType](#keysetreftype)_ | Type defines type of the KeySet object reference. It can be one of: - namespacedRef |
+| `type` _[KeySetRefType](#keysetreftype)_ | Type defines type of the KeySet object reference. It can be one of: - konnectID - namespacedRef |
| `konnectID` _string_ | KonnectID is the schema for the KonnectID type. This field is required when the Type is konnectID. |
| `namespacedRef` _[KeySetNamespacedRef](#keysetnamespacedref)_ | NamespacedRef is a reference to a KeySet entity inside the cluster. This field is required when the Type is namespacedRef. |
diff --git a/test/crdsvalidation/kongkey_test.go b/test/crdsvalidation/kongkey_test.go
index 104bcb23..68b83831 100644
--- a/test/crdsvalidation/kongkey_test.go
+++ b/test/crdsvalidation/kongkey_test.go
@@ -163,8 +163,6 @@ func TestKongKey(t *testing.T) {
},
},
},
- // TODO change when konnectID ref is allowed
- ExpectedErrorMessage: lo.ToPtr("Unsupported value: \"konnectID\": supported values: \"namespacedRef\""),
},
{
Name: "when type is 'konnectID', konnectID is required",
@@ -180,8 +178,7 @@ func TestKongKey(t *testing.T) {
},
},
},
- // TODO change when konnectID ref is allowed
- ExpectedErrorMessage: lo.ToPtr("Unsupported value: \"konnectID\": supported values: \"namespacedRef\""),
+ ExpectedErrorMessage: lo.ToPtr("when type is konnectID, konnectID must be set"),
},
{
Name: "unknown type is not accepted",
diff --git a/test/crdsvalidation/suite_crd_ref_change_test.go b/test/crdsvalidation/suite_crd_ref_change_test.go
index d668e483..8e657290 100644
--- a/test/crdsvalidation/suite_crd_ref_change_test.go
+++ b/test/crdsvalidation/suite_crd_ref_change_test.go
@@ -125,11 +125,9 @@ func NewCRDValidationTestCasesGroupCPRefChange[
},
})
ret = append(ret, crdsvalidation.TestCase[T]{
- Name: "providing konnectNamespacedRef when type is konnectID yields an error",
- TestObject: obj,
- // TODO: change when konnectID is allowed
- // ExpectedErrorMessage: lo.ToPtr("when type is konnectID, konnectID must be set"),
- ExpectedErrorMessage: lo.ToPtr("Unsupported value: \"konnectID\": supported values: \"konnectNamespacedRef\", \"kic\""),
+ Name: "providing konnectNamespacedRef when type is konnectID yields an error",
+ TestObject: obj,
+ ExpectedErrorMessage: lo.ToPtr("when type is konnectID, konnectID must be set"),
})
}
{
@@ -142,10 +140,9 @@ func NewCRDValidationTestCasesGroupCPRefChange[
},
})
ret = append(ret, crdsvalidation.TestCase[T]{
- Name: "providing konnectNamespacedRef and konnectID when type is konnectID yields an error",
- TestObject: obj,
- // TODO: change when konnectID is allowed
- ExpectedErrorMessage: lo.ToPtr("Unsupported value: \"konnectID\": supported values: \"konnectNamespacedRef\", \"kic\""),
+ Name: "providing konnectNamespacedRef and konnectID when type is konnectID yields an error",
+ TestObject: obj,
+ ExpectedErrorMessage: lo.ToPtr("when type is konnectID, konnectNamespacedRef must not be set"),
})
}
{