From f6c12287b27a44c48cc8b6f142d0b0214a3ea097 Mon Sep 17 00:00:00 2001 From: erabii Date: Sat, 22 Feb 2025 16:18:23 +0200 Subject: [PATCH] drop un-used configmap (#1880) * cleanup Signed-off-by: wind57 * cleanup Signed-off-by: wind57 * formatting Signed-off-by: wind57 --------- Signed-off-by: wind57 --- .../integration/tests/commons/Images.java | 2 +- .../tests/commons/native_client/Util.java | 3 --- .../src/main/resources/current-images.txt | 2 +- .../kafka/kafka-configmap-startup-script.yaml | 12 ------------ .../main/resources/kafka/kafka-deployment.yaml | 18 ++++-------------- 5 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java index 4a39540a..82d5a4e2 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java @@ -46,7 +46,7 @@ public final class Images { private static final String ISTIO_PILOT_TAR = ISTIO_PILOT.replace('/', '-') + ":" + istioVersion(); - private static final String KAFKA = "confluentinc/cp-kafka"; + private static final String KAFKA = "confluentinc/confluent-local"; private static final String KAFKA_TAR = KAFKA.replace('/', '-') + kafkaVersion(); diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index bb24aa01..0c3cd190 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -267,14 +267,11 @@ public final class Util { deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(imageWithVersion); V1Service service = (V1Service) yaml("kafka/kafka-service.yaml"); - V1ConfigMap configMap = (V1ConfigMap) yaml("kafka/kafka-configmap-startup-script.yaml"); if (phase.equals(Phase.CREATE)) { - createAndWait(namespace, configMap, null); createAndWait(namespace, "kafka", deployment, service, null, false); } else if (phase.equals(Phase.DELETE)) { - deleteAndWait(namespace, configMap, null); deleteAndWait(namespace, deployment, service, null); } } diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt b/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt index 28536734..ce865b9d 100644 --- a/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt +++ b/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt @@ -2,6 +2,6 @@ busybox:1.36.1 istio/istioctl:1.21.6 istio/proxyv2:1.21.6 istio/pilot:1.21.6 -confluentinc/cp-kafka:7.2.1 +confluentinc/confluent-local:7.9.0 rabbitmq:3-management wiremock/wiremock:3.4.2 diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml deleted file mode 100644 index de6ffe21..00000000 --- a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: kafka-start-config-script -data: - kafka_start.sh: | - #!/bin/sh - sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure - sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure - KAFKA_CLUSTER_ID="$(kafka-storage random-uuid)" - echo "kafka-storage format --ignore-formatted -t $KAFKA_CLUSTER_ID -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure - /etc/confluent/docker/run diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml index 8a8db713..45d09474 100644 --- a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml +++ b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml @@ -21,24 +21,16 @@ spec: # and this will cause this problem: https://github.com/confluentinc/cp-docker-images/blob/master/debian/kafka/include/etc/confluent/docker/configure#L58-L62 # Another solution is to rename the service. enableServiceLinks: false - volumes: - - name: kafka-start-config-script - configMap: - name: kafka-start-config-script - defaultMode: 0755 containers: - - name: kafka-start-config-script - volumeMounts: - - name: kafka-start-config-script - mountPath: /tmp - command: - - /tmp/kafka_start.sh - image: confluentinc/cp-kafka + - name: kafka-broker + image: confluentinc/confluent-local ports: - containerPort: 9092 env: - name: KAFKA_BROKER_ID value: "1" + - name: KAFKA_NODE_ID + value: "1" - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT" - name: KAFKA_ADVERTISED_LISTENERS @@ -47,8 +39,6 @@ spec: value: "1" - name: KAFKA_PROCESS_ROLES value: "broker,controller" - - name: KAFKA_NODE_ID - value: "1" - name: KAFKA_LISTENERS value: "PLAINTEXT://:9092,CONTROLLER://:9093" - name: KAFKA_INTER_BROKER_LISTENER_NAME