diff --git a/.github/workflows/regenerate_on_deps_bump.yaml b/.github/workflows/regenerate_on_deps_bump.yaml index 7096f1bc3b..446afa5d52 100644 --- a/.github/workflows/regenerate_on_deps_bump.yaml +++ b/.github/workflows/regenerate_on_deps_bump.yaml @@ -17,6 +17,7 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.ref }} + token: ${{ secrets.K8S_TEAM_BOT_GH_PAT }} - name: setup golang uses: actions/setup-go@v5 @@ -30,12 +31,6 @@ jobs: - name: regenerate run: make generate manifests - - name: Set github url and credentials - run: | - /usr/bin/git config --global --add url."https://${{ secrets.K8S_TEAM_BOT_GH_PAT }}:x-oauth-basic@github".insteadOf ssh://git@github - /usr/bin/git config --global --add url."https://${{ secrets.K8S_TEAM_BOT_GH_PAT }}:x-oauth-basic@github".insteadOf https://github - /usr/bin/git config --global --add url."https://${{ secrets.K8S_TEAM_BOT_GH_PAT }}:x-oauth-basic@github".insteadOf git@github - - name: commit and push (if changes detected) run: | git config --global user.name "github-actions" diff --git a/config/crd/incubator/kustomization.yaml b/config/crd/incubator/kustomization.yaml index 4746cdc6af..42fd40aee6 100644 --- a/config/crd/incubator/kustomization.yaml +++ b/config/crd/incubator/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://github.com/kong/kubernetes-configuration/config/crd/ingress-controller-incubator?ref=v0.0.44 # Version is auto-updated by the generating script. + - https://github.com/kong/kubernetes-configuration/config/crd/ingress-controller-incubator?ref=v0.0.46 # Version is auto-updated by the generating script. diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 3aa2fa3f66..636c0409a9 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://github.com/kong/kubernetes-configuration/config/crd/ingress-controller?ref=v0.0.44 # Version is auto-updated by the generating script. + - https://github.com/kong/kubernetes-configuration/config/crd/ingress-controller?ref=v0.0.46 # Version is auto-updated by the generating script. diff --git a/go.mod b/go.mod index 2c8e4e8c25..a41d619e04 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/jpillora/backoff v1.0.0 github.com/kong/go-database-reconciler v1.15.0 github.com/kong/go-kong v0.59.1 - github.com/kong/kubernetes-configuration v0.0.44 + 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/lithammer/dedent v1.1.0 @@ -209,7 +209,7 @@ require ( golang.org/x/term v0.26.0 // indirect golang.org/x/text v0.20.0 // indirect golang.org/x/time v0.8.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/tools v0.26.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect diff --git a/go.sum b/go.sum index f1041897f2..666aa7ae89 100644 --- a/go.sum +++ b/go.sum @@ -239,8 +239,8 @@ github.com/kong/go-database-reconciler v1.15.0 h1:5F5Zzp2H14aiDmqWUCaU4+LGR/lGnv github.com/kong/go-database-reconciler v1.15.0/go.mod h1:T5BkBw13PZWub3y2jKAoM7fYD+UmXp2iNqj1YqD0L90= 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.44 h1:85q8PugPeWQ7AKvEeGXxDoa+XCzTdNMj1qFcHyxHHds= -github.com/kong/kubernetes-configuration v0.0.44/go.mod h1:ym++Oygj/wZjaCanK8a+mjZ1jttPF7gPP1OBV0aqI00= +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= @@ -539,8 +539,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml b/test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml index 7ba5d319f8..3cbf4c99e0 100644 --- a/test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml +++ b/test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml @@ -447,39 +447,46 @@ 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: 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' name: description: Name is the name of the ConsumerGroup in Kong. type: string @@ -712,39 +719,46 @@ 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: 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' tags: description: Tags is an optional set of tags applied to the consumer. items: @@ -2892,39 +2906,46 @@ 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: 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' description: description: Description is the additional information about the vault. type: string diff --git a/test/e2e/manifests/all-in-one-dbless-konnect-enterprise.yaml b/test/e2e/manifests/all-in-one-dbless-konnect-enterprise.yaml index 1655ab5a7b..dbc0f0820f 100644 --- a/test/e2e/manifests/all-in-one-dbless-konnect-enterprise.yaml +++ b/test/e2e/manifests/all-in-one-dbless-konnect-enterprise.yaml @@ -447,39 +447,46 @@ 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: 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' name: description: Name is the name of the ConsumerGroup in Kong. type: string @@ -712,39 +719,46 @@ 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: 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' tags: description: Tags is an optional set of tags applied to the consumer. items: @@ -2892,39 +2906,46 @@ 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: 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' description: description: Description is the additional information about the vault. type: string diff --git a/test/e2e/manifests/all-in-one-dbless-konnect.yaml b/test/e2e/manifests/all-in-one-dbless-konnect.yaml index d114231596..d478be6f1e 100644 --- a/test/e2e/manifests/all-in-one-dbless-konnect.yaml +++ b/test/e2e/manifests/all-in-one-dbless-konnect.yaml @@ -447,39 +447,46 @@ 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: 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' name: description: Name is the name of the ConsumerGroup in Kong. type: string @@ -712,39 +719,46 @@ 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: 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' tags: description: Tags is an optional set of tags applied to the consumer. items: @@ -2892,39 +2906,46 @@ 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: 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' description: description: Description is the additional information about the vault. type: string diff --git a/test/e2e/manifests/all-in-one-dbless.yaml b/test/e2e/manifests/all-in-one-dbless.yaml index 974b2bbf67..2fdc02a64b 100644 --- a/test/e2e/manifests/all-in-one-dbless.yaml +++ b/test/e2e/manifests/all-in-one-dbless.yaml @@ -447,39 +447,46 @@ 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: 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' name: description: Name is the name of the ConsumerGroup in Kong. type: string @@ -712,39 +719,46 @@ 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: 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' tags: description: Tags is an optional set of tags applied to the consumer. items: @@ -2892,39 +2906,46 @@ 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: 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' description: description: Description is the additional information about the vault. type: string diff --git a/test/e2e/manifests/all-in-one-postgres-enterprise.yaml b/test/e2e/manifests/all-in-one-postgres-enterprise.yaml index 70483b23de..97bdf82396 100644 --- a/test/e2e/manifests/all-in-one-postgres-enterprise.yaml +++ b/test/e2e/manifests/all-in-one-postgres-enterprise.yaml @@ -447,39 +447,46 @@ 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: 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' name: description: Name is the name of the ConsumerGroup in Kong. type: string @@ -712,39 +719,46 @@ 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: 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' tags: description: Tags is an optional set of tags applied to the consumer. items: @@ -2892,39 +2906,46 @@ 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: 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' description: description: Description is the additional information about the vault. type: string diff --git a/test/e2e/manifests/all-in-one-postgres-multiple-gateways.yaml b/test/e2e/manifests/all-in-one-postgres-multiple-gateways.yaml index 9b0270f589..6fc41e5329 100644 --- a/test/e2e/manifests/all-in-one-postgres-multiple-gateways.yaml +++ b/test/e2e/manifests/all-in-one-postgres-multiple-gateways.yaml @@ -447,39 +447,46 @@ 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: 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' name: description: Name is the name of the ConsumerGroup in Kong. type: string @@ -712,39 +719,46 @@ 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: 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' tags: description: Tags is an optional set of tags applied to the consumer. items: @@ -2892,39 +2906,46 @@ 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: 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' description: description: Description is the additional information about the vault. type: string diff --git a/test/e2e/manifests/all-in-one-postgres.yaml b/test/e2e/manifests/all-in-one-postgres.yaml index c6f5a328fa..ec8c3731ce 100644 --- a/test/e2e/manifests/all-in-one-postgres.yaml +++ b/test/e2e/manifests/all-in-one-postgres.yaml @@ -447,39 +447,46 @@ 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: 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' name: description: Name is the name of the ConsumerGroup in Kong. type: string @@ -712,39 +719,46 @@ 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: 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' tags: description: Tags is an optional set of tags applied to the consumer. items: @@ -2892,39 +2906,46 @@ 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: 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' description: description: Description is the additional information about the vault. type: string