cr fixes and skipping for db-less for now

Kong · Jul 28, 2023 · 86ab16b · 86ab16b
1 parent f5b9f19
commit 86ab16b
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 13 deletions.
diff --git 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
diff --git a/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml b/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml
diff --git a/deploy/single/all-in-one-dbless-konnect-enterprise.yaml b/deploy/single/all-in-one-dbless-konnect-enterprise.yaml
diff --git a/deploy/single/all-in-one-dbless-konnect.yaml b/deploy/single/all-in-one-dbless-konnect.yaml
diff --git a/deploy/single/all-in-one-dbless-legacy.yaml b/deploy/single/all-in-one-dbless-legacy.yaml
diff --git a/deploy/single/all-in-one-dbless.yaml b/deploy/single/all-in-one-dbless.yaml
diff --git a/deploy/single/all-in-one-postgres-enterprise.yaml b/deploy/single/all-in-one-postgres-enterprise.yaml
diff --git a/deploy/single/all-in-one-postgres.yaml b/deploy/single/all-in-one-postgres.yaml
diff --git a/docs/api-reference.md b/docs/api-reference.md
diff --git 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
@@ -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
@@ -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{