diff --git a/config/crd/bases/configuration.konghq.com_kongconsumers.yaml b/config/crd/bases/configuration.konghq.com_kongconsumers.yaml index c4b93cdbb8..f0f36a1a8b 100644 --- a/config/crd/bases/configuration.konghq.com_kongconsumers.yaml +++ b/config/crd/bases/configuration.konghq.com_kongconsumers.yaml @@ -41,7 +41,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-dbless-enterprise.yaml b/deploy/single/all-in-one-dbless-enterprise.yaml index a648232cc1..7098f66c86 100644 --- a/deploy/single/all-in-one-dbless-enterprise.yaml +++ b/deploy/single/all-in-one-dbless-enterprise.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml b/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml index 83fdb4443d..74ac972ed2 100644 --- a/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml +++ b/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-dbless-konnect-enterprise.yaml b/deploy/single/all-in-one-dbless-konnect-enterprise.yaml index 29ef1ec4db..56502ff879 100644 --- a/deploy/single/all-in-one-dbless-konnect-enterprise.yaml +++ b/deploy/single/all-in-one-dbless-konnect-enterprise.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-dbless-konnect.yaml b/deploy/single/all-in-one-dbless-konnect.yaml index 14d5807240..11203a1b16 100644 --- a/deploy/single/all-in-one-dbless-konnect.yaml +++ b/deploy/single/all-in-one-dbless-konnect.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-dbless-legacy.yaml b/deploy/single/all-in-one-dbless-legacy.yaml index f6f58f5320..fc4f6ec8f5 100644 --- a/deploy/single/all-in-one-dbless-legacy.yaml +++ b/deploy/single/all-in-one-dbless-legacy.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-dbless.yaml b/deploy/single/all-in-one-dbless.yaml index 3218488bc7..4dbd82c608 100644 --- a/deploy/single/all-in-one-dbless.yaml +++ b/deploy/single/all-in-one-dbless.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-postgres-enterprise.yaml b/deploy/single/all-in-one-postgres-enterprise.yaml index 69e65e1fd0..96e4074092 100644 --- a/deploy/single/all-in-one-postgres-enterprise.yaml +++ b/deploy/single/all-in-one-postgres-enterprise.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/deploy/single/all-in-one-postgres.yaml b/deploy/single/all-in-one-postgres.yaml index af6114dcfb..eee924c36d 100644 --- a/deploy/single/all-in-one-postgres.yaml +++ b/deploy/single/all-in-one-postgres.yaml @@ -485,7 +485,7 @@ spec: internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string consumer_groups: - description: ConsumerGroups are references to Consumer Groups (that Consumer + description: ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. items: type: string diff --git a/docs/api-reference.md b/docs/api-reference.md index dca7787e5e..e0ea3ae7e9 100644 --- a/docs/api-reference.md +++ b/docs/api-reference.md @@ -57,7 +57,7 @@ KongConsumer is the Schema for the kongconsumers API. | `username` _string_ | Username is a Kong cluster-unique username of the consumer. | | `custom_id` _string_ | CustomID is a Kong cluster-unique existing ID for the consumer - useful for mapping Kong with users in your existing database. | | `credentials` _string array_ | Credentials are references to secrets containing a credential to be provisioned in Kong. | -| `consumer_groups` _string array_ | ConsumerGroups are references to Consumer Groups (that Consumer wants to be part of) provisioned in Kong. | +| `consumer_groups` _string array_ | ConsumerGroups are references to consumer groups (that consumer wants to be part of) provisioned in Kong. | diff --git a/internal/dataplane/kongstate/kongstate.go b/internal/dataplane/kongstate/kongstate.go index a0a22a66e6..768d34a257 100644 --- a/internal/dataplane/kongstate/kongstate.go +++ b/internal/dataplane/kongstate/kongstate.go @@ -77,7 +77,7 @@ func (ks *KongState) FillConsumersAndCredentials( for _, cgName := range consumer.ConsumerGroups { cg, err := s.GetKongConsumerGroup(consumer.Namespace, cgName) if err != nil { - failuresCollector.PushResourceFailure(fmt.Sprintf("non-existing consumer group: %q", err), consumer) + failuresCollector.PushResourceFailure(fmt.Sprintf("nonexistent consumer group: %q", err), consumer) continue } c.ConsumerGroups = append(c.ConsumerGroups, kong.ConsumerGroup{ diff --git a/pkg/apis/configuration/v1/kongconsumer_types.go b/pkg/apis/configuration/v1/kongconsumer_types.go index 30c17c16cb..b0291eeef0 100644 --- a/pkg/apis/configuration/v1/kongconsumer_types.go +++ b/pkg/apis/configuration/v1/kongconsumer_types.go @@ -46,7 +46,7 @@ type KongConsumer struct { // Credentials are references to secrets containing a credential to be // provisioned in Kong. Credentials []string `json:"credentials,omitempty"` - // ConsumerGroups are references to Consumer Groups (that Consumer wants to be part of) + // ConsumerGroups are references to consumer groups (that consumer wants to be part of) // provisioned in Kong. ConsumerGroups []string `json:"consumer_groups,omitempty"` diff --git a/test/integration/consumer_group_test.go b/test/integration/consumer_group_test.go index 721d915d8c..00c28a6672 100644 --- a/test/integration/consumer_group_test.go +++ b/test/integration/consumer_group_test.go @@ -28,6 +28,12 @@ func TestConsumerGroup(t *testing.T) { RunWhenKongVersion(t, fmt.Sprintf(">=%s", versions.ConsumerGroupsVersionCutoff)) RunWhenKongEnterprise(t) + // Get rid of skip when Gateway 3.4 will be released. + // Issue https://konghq.atlassian.net/browse/FTI-5264 will be resolved. + if testenv.DBMode() == testenv.DBModeOff { + t.Skip("due to a bug in Kong Gateway for DB-less mode and consumer groups, this test has to be skipped") + } + ctx := context.Background() ns, cleaner := helpers.Setup(ctx, t, env) @@ -57,7 +63,7 @@ func TestConsumerGroup(t *testing.T) { } const consumerName = "test-consumer" - t.Logf("configuring Consumer : %q", consumerName) + t.Logf("configuring consumer: %q", consumerName) consumer, err := c.ConfigurationV1().KongConsumers(ns.Name).Create( ctx, &kongv1.KongConsumer{