diff --git a/.github/renovate.json b/.github/renovate.json index e8b5927259..be82bb3924 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -19,11 +19,11 @@ "kroxylicious-kms-provider-hashicorp-vault-test-support/src/main/java/io/kroxylicious/kms/provider/hashicorp/vault/VaultTestKmsFacade.java", "kroxylicious-kms-provider-hashicorp-vault/src/test/java/io/kroxylicious/kms/provider/hashicorp/vault/TestVault.java", "kroxylicious-systemtests/src/main/resources/helm_vault_overrides.yaml", - "performance-tests/docker-compose.yaml" + "performance-tests/perf-tests.sh" ], "matchStrings": [ "DockerImageName\\.parse\\(\"(?hashicorp/vault):(?\\d+\\.\\d+.\\d+)\"\\)", - "image:.*(?hashicorp/vault):(?\\d+\\.\\d+.\\d+)", + "(?hashicorp/vault):(?\\d+\\.\\d+.\\d+)", "tag:.*(?\\d+\\.\\d+.\\d+)" ], "datasourceTemplate": "docker" diff --git a/performance-tests/04-record-encryption-filter/config.yaml b/performance-tests/04-record-encryption-filter/config.yaml index 29bb41817e..7eb7a918ca 100644 --- a/performance-tests/04-record-encryption-filter/config.yaml +++ b/performance-tests/04-record-encryption-filter/config.yaml @@ -20,7 +20,7 @@ virtualClusters: logFrames: false filterDefinitions: - name: encrypt -- type: RecordEncryption + type: RecordEncryption config: kms: VaultKmsService kmsConfig: diff --git a/performance-tests/docker-compose.yaml b/performance-tests/docker-compose.yaml index e6b332e4fb..07a8faa1c2 100644 --- a/performance-tests/docker-compose.yaml +++ b/performance-tests/docker-compose.yaml @@ -31,7 +31,7 @@ services: networks: - perf_network vault: - image: ${VAULT_IMAGE:-hashicorp/vault:1.18.3} + image: ${VAULT_IMAGE} hostname: vault container_name: vault ports: diff --git a/performance-tests/perf-tests.sh b/performance-tests/perf-tests.sh index 7dd5fc850a..11f8ca60b9 100755 --- a/performance-tests/perf-tests.sh +++ b/performance-tests/perf-tests.sh @@ -27,24 +27,30 @@ NOCOLOR='\033[0m' KROXYLICIOUS_CHECKOUT=${KROXYLICIOUS_CHECKOUT:-${PERF_TESTS_DIR}/..} +DOCKER_REGISTRY="docker.io" +if [ "${USE_DOCKER_MIRROR}" == "true" ] +then + DOCKER_REGISTRY="mirror.gcr.io" +fi + KAFKA_VERSION=${KAFKA_VERSION:-$(mvn -f "${KROXYLICIOUS_CHECKOUT}"/pom.xml org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=kafka.version -q -DforceStdout -pl kroxylicious-systemtests)} STRIMZI_VERSION=${STRIMZI_VERSION:-$(mvn -f "${KROXYLICIOUS_CHECKOUT}"/pom.xml org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=strimzi.version -q -DforceStdout)} KROXYLICIOUS_VERSION=${KROXYLICIOUS_VERSION:-$(mvn -f "${KROXYLICIOUS_CHECKOUT}"/pom.xml org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=project.version -q -DforceStdout)} KAFKA_TOOL_IMAGE=${KAFKA_TOOL_IMAGE:-quay.io/strimzi/kafka:${STRIMZI_VERSION}-kafka-${KAFKA_VERSION}} -KAFKA_IMAGE=${KAFKA_IMAGE:-"apache/kafka-native:${KAFKA_VERSION}"} +KAFKA_IMAGE=${KAFKA_IMAGE:-"${DOCKER_REGISTRY}/apache/kafka-native:${KAFKA_VERSION}"} KROXYLICIOUS_IMAGE=${KROXYLICIOUS_IMAGE:-"quay.io/kroxylicious/kroxylicious:${KROXYLICIOUS_VERSION}"} +VAULT_IMAGE=${VAULT_IMAGE:-"${DOCKER_REGISTRY}/hashicorp/vault:1.18.3"} PERF_NETWORK=performance-tests_perf_network CONTAINER_ENGINE=${CONTAINER_ENGINE:-"docker"} LOADER_DIR=${LOADER_DIR:-"/tmp/asprof-extracted"} -export KAFKA_VERSION KAFKA_TOOL_IMAGE KAFKA_IMAGE KROXYLICIOUS_IMAGE CONTAINER_ENGINE - - +export KAFKA_VERSION KAFKA_TOOL_IMAGE KAFKA_IMAGE KROXYLICIOUS_IMAGE VAULT_IMAGE CONTAINER_ENGINE printf "KAFKA_VERSION: ${KAFKA_VERSION}\n" printf "STRIMZI_VERSION: ${STRIMZI_VERSION}\n" printf "KROXYLICIOUS_VERSION: ${KROXYLICIOUS_VERSION}\n" printf "KAFKA_IMAGE: ${KAFKA_IMAGE}\n" printf "KROXYLICIOUS_IMAGE: ${KROXYLICIOUS_IMAGE}\n" +printf "VAULT_IMAGE: ${VAULT_IMAGE}\n" runDockerCompose () {