Merge branch 'master' into miani-k8s-prometheus-operator-20250114

GoogleCloudPlatform · Jan 20, 2025 · e3982e0 · e3982e0
2 parents 981f705 + b15857b
commit e3982e0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/k8s/cassandra/Makefile b/k8s/cassandra/Makefile
@@ -8,6 +8,7 @@ APP_ID ?= $(CHART_NAME)
 VERIFY_WAIT_TIMEOUT = 1800
 
 TRACK ?= 4.1
+SERVICE_NAME := services/5a7d4b26-04c9-4426-b4d2-e1e645683965.cloudpartnerservices.goog
 
 METRICS_EXPORTER_TAG ?= v0.11.1-gke.1
 

diff --git a/k8s/cassandra/apptest/tester/Dockerfile b/k8s/cassandra/apptest/tester/Dockerfile
@@ -1,20 +1,21 @@
-FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.5
+FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    gettext \
-    jq \
-    uuid-runtime \
-    wget \
-    python3 \
-    python3-pip \
-    python3-setuptools \
-    && pip install --upgrade pip \
-    && pip install --upgrade wheel \
-    && pip install cqlsh futures \
+        ca-certificates \
+        gettext \
+        jq \
+        uuid-runtime \
+        curl \
+        wget \
+        python3 \
+        python3-pip \
+        python3-setuptools \
+        python3-wheel \
+        pipx \
+    && pipx install cqlsh \
     && rm -rf /var/lib/apt/lists/*
 
-RUN wget -q -O /bin/kubectl \
+RUN curl -L -o /bin/kubectl \
     https://storage.googleapis.com/kubernetes-release/release/v1.24.10/bin/linux/amd64/kubectl \
       && chmod 755 /bin/kubectl
 

diff --git a/k8s/cassandra/apptest/tester/tests/basic-suite.yaml b/k8s/cassandra/apptest/tester/tests/basic-suite.yaml
@@ -24,7 +24,7 @@ actions:
 
       for ((pod=0; pod<${replicas}; pod++)); do
         export CQLSH_HOST="${APP_INSTANCE_NAME}-cassandra-${pod}.${DOMAIN}"
-        cqlsh -e "SHOW HOST" --cqlversion="3.4.6"
+        /root/.local/bin/cqlsh -e "SHOW HOST" --cqlversion="3.4.6"
       done
     expect:
       exitCode:
@@ -52,12 +52,12 @@ actions:
       DOMAIN="${APP_INSTANCE_NAME}-cassandra-svc.${NAMESPACE}.svc.cluster.local"
 
       export CQLSH_HOST="${APP_INSTANCE_NAME}-cassandra-0.${DOMAIN}"
-      cqlsh -e "CREATE KEYSPACE demo WITH REPLICATION ={ 'class' : 'SimpleStrategy', 'replication_factor' : 2 };" --cqlversion="3.4.6" > /dev/null
-      cqlsh -e "CREATE TABLE demo.person ( name varchar PRIMARY KEY );" --cqlversion="3.4.6" > /dev/null
-      cqlsh -e "INSERT INTO demo.person  ( name ) VALUES ( 'John' );" --cqlversion="3.4.6" > /dev/null
+      /root/.local/bin/cqlsh -e "CREATE KEYSPACE demo WITH REPLICATION ={ 'class' : 'SimpleStrategy', 'replication_factor' : 2 };" --cqlversion="3.4.6" > /dev/null
+      /root/.local/bin/cqlsh -e "CREATE TABLE demo.person ( name varchar PRIMARY KEY );" --cqlversion="3.4.6" > /dev/null
+      /root/.local/bin/cqlsh -e "INSERT INTO demo.person  ( name ) VALUES ( 'John' );" --cqlversion="3.4.6" > /dev/null
 
       export CQLSH_HOST="${APP_INSTANCE_NAME}-cassandra-1.${DOMAIN}"
-      cqlsh -e "SELECT * FROM demo.person" --cqlversion="3.4.6"
+      /root/.local/bin/cqlsh -e "SELECT * FROM demo.person" --cqlversion="3.4.6"
     expect:
       stdout:
         contains: 'John'

diff --git a/k8s/kafka/Makefile b/k8s/kafka/Makefile
@@ -8,6 +8,7 @@ APP_ID ?= $(CHART_NAME)
 WAIT_FOR_READY_TIMEOUT := 600
 
 TRACK ?= 3.7
+SERVICE_NAME := services/de661158-ff88-479d-bcf3-206917bed7f6.cloudpartnerservices.goog
 KAFKA_EXPORTER_TAG ?= 1.8
 ZK_TAG ?= 3.8
 METRICS_EXPORTER_TAG ?= v0.11.1-gke.1

diff --git a/k8s/kafka/apptest/tester/Dockerfile b/k8s/kafka/apptest/tester/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.5
+FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8
 
 ARG KUBECTL_VERSION=1.12.0
 ARG KAFKA_VERSION=2.8.0
@@ -13,11 +13,11 @@ RUN set -eu \
     uuid-runtime \
     wget \
     curl \
-    openjdk-11-jre \
-    netcat
+    openjdk-17-jre \
+    netcat-traditional
 
 RUN set -eu \
-    && wget -q -O /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
+    && curl -L -o /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
     && chmod 755 /bin/kubectl \
     && curl -sSL https://archive.apache.org/dist/kafka/${KAFKA_VERSION}/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -o "/opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz" \
     && tar -xzf /opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt \