more

Author: amuraru

config/samples/kraft/simplekafkacluster_kraft_with_envoy.yaml

@@ -46,6 +46,14 @@ spec:
           - "controller"
   rollingUpgradeConfig:
     failureThreshold: 1
+  cruiseControlConfig:
+    cruiseControlTaskSpec:
+      RetryDurationMinutes: 5
+    topicConfig:
+      partitions: 12
+      replicationFactor: 3
+    config: |
+      # Cruise Control configuration
   listenersConfig:
     internalListeners:
       - type: "plaintext"

config/samples/kraft/simplekafkacluster_kraft_with_envoygateway.yaml

@@ -76,6 +76,14 @@ spec:
           - "controller"
   rollingUpgradeConfig:
     failureThreshold: 1
+  cruiseControlConfig:
+    cruiseControlTaskSpec:
+      RetryDurationMinutes: 5
+    topicConfig:
+      partitions: 12
+      replicationFactor: 3
+    config: |
+      # Cruise Control configuration
   listenersConfig:
     internalListeners:
       - type: "plaintext"

config/samples/simplekafkacluster_with_envoy.yaml

@@ -41,6 +41,14 @@ spec:
       brokerConfigGroup: "default"
   rollingUpgradeConfig:
     failureThreshold: 1
+  cruiseControlConfig:
+    cruiseControlTaskSpec:
+      RetryDurationMinutes: 5
+    topicConfig:
+      partitions: 12
+      replicationFactor: 3
+    config: |
+      # Cruise Control configuration
   listenersConfig:
     internalListeners:
       - type: "plaintext"

config/samples/simplekafkacluster_with_envoygateway.yaml

@@ -71,6 +71,14 @@ spec:
       brokerConfigGroup: "default"
   rollingUpgradeConfig:
     failureThreshold: 1
+  cruiseControlConfig:
+    cruiseControlTaskSpec:
+      RetryDurationMinutes: 5
+    topicConfig:
+      partitions: 12
+      replicationFactor: 3
+    config: |
+      # Cruise Control configuration
   listenersConfig:
     internalListeners:
       - type: "plaintext"

pkg/resources/envoygateway/gateway.go

@@ -89,7 +89,7 @@ func (r *Reconciler) gateway(eListener v1beta1.ExternalListenerConfig,
 
 	anycastListener := gatewayv1.Listener{
 		Name:     anycastListenerName,
-		Port:     gatewayv1.PortNumber(anycastPort),
+		Port:     anycastPort,
 		Protocol: gatewayv1.TCPProtocolType,
 	}
 

tests/e2e/global.go

@@ -56,13 +56,16 @@ var (
 	// envoyGatewayHelmDescriptor describes the Envoy Gateway Helm component
 	// The Helm chart installs Gateway API CRDs and Envoy Gateway CRDs automatically
 	envoyGatewayHelmDescriptor = helmDescriptor{
-		Repository:   "oci://docker.io/envoyproxy",
-		ChartName:    "gateway-helm",
+		Repository:   "",
+		ChartName:    "oci://docker.io/envoyproxy/gateway-helm",
 		ChartVersion: EnvoyGatewayVersion,
 		ReleaseName:  "eg",
 		Namespace:    "envoy-gateway-system",
 		SetValues: map[string]string{
-			"createNamespace": "true",
+			"deployment.envoyGateway.resources.limits.cpu":      "500m",
+			"deployment.envoyGateway.resources.limits.memory":   "1024Mi",
+			"deployment.envoyGateway.resources.requests.cpu":    "100m",
+			"deployment.envoyGateway.resources.requests.memory": "256Mi",
 		},
 		HelmExtraArguments: map[string][]string{
 			"install": {"--timeout", "10m"},

tests/e2e/koperator_suite_test.go

@@ -74,18 +74,22 @@ var _ = ginkgo.When("Testing e2e test altogether", ginkgo.Ordered, func() {
 	testProduceConsumeInternal()
 	testJmxExporter()
 	testUninstallKafkaCluster()
+	testInstallZookeeperCluster()
 	testInstallEnvoyKafkaCluster("Installing Kafka cluster (Zookeeper-based, Envoy ingress)", "../../config/samples/simplekafkacluster_with_envoy.yaml")
 	testProduceConsumeInternal()
 	testJmxExporter()
 	testUninstallKafkaCluster()
+	testUninstallZookeeperCluster()
 	testInstallEnvoyKafkaCluster("Installing Kafka cluster (KRaft mode, Envoy ingress)", "../../config/samples/kraft/simplekafkacluster_kraft_with_envoy.yaml")
 	testProduceConsumeInternal()
 	testJmxExporter()
 	testUninstallKafkaCluster()
+	testInstallZookeeperCluster()
 	testInstallEnvoyGatewayKafkaCluster("Installing Kafka cluster (Zookeeper-based, Envoy Gateway ingress)", "../../config/samples/simplekafkacluster_with_envoygateway.yaml")
 	testProduceConsumeInternal()
 	testJmxExporter()
 	testUninstallEnvoyGatewayKafkaCluster("../../config/samples/simplekafkacluster_with_envoygateway.yaml")
+	testUninstallZookeeperCluster()
 	testInstallEnvoyGatewayKafkaCluster("Installing Kafka cluster (KRaft mode, Envoy Gateway ingress)", "../../config/samples/kraft/simplekafkacluster_kraft_with_envoygateway.yaml")
 	testProduceConsumeInternal()
 	testJmxExporter()

tests/e2e/test_install.go

@@ -50,6 +50,17 @@ func testInstall() bool {
 				err = envoyGatewayHelmDescriptor.installHelmChart(kubectlOptions)
 				gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			})
+
+			ginkgo.It("Creating Envoy Gateway GatewayClass", func() {
+				gatewayClassManifest := `apiVersion: gateway.networking.k8s.io/v1
+kind: GatewayClass
+metadata:
+  name: eg
+spec:
+  controllerName: gateway.envoyproxy.io/gatewayclass-controller`
+				err = applyK8sResourceManifestFromString(kubectlOptions, gatewayClassManifest)
+				gomega.Expect(err).NotTo(gomega.HaveOccurred())
+			})
 		})
 
 		ginkgo.When("Installing zookeeper-operator", func() {