Skip to content

Commit e872ead

Browse files
authored
build(image): rename proxy container image to quay.io/kroxylicious/proxy (kroxylicious#3882)
Standardize on the new proxy image name quay.io/kroxylicious/proxy across all code, configuration, tests, and documentation. This completes the migration from the original quay.io/kroxylicious/kroxylicious naming. Changes: - Update operator properties file to use new image name - Update GitHub workflows (maven.yaml, run-system-tests.yaml, documentation-tests.yml) - Remove backward-compatibility retagging in Minikube workflows - Add backwards-compatible retagging in docker workflow - Update all operator test fixtures and assertions - Update user-facing scripts (run-example.sh, perf-tests.sh) - Update documentation (DEV_GUIDE.md, release-manifest.yaml) - Add CHANGELOG entry Note: GitHub org variable PROXY_IMAGE_NAME must be manually updated from 'kroxylicious' to 'proxy' after this change is merged. Assisted-by: Claude Sonnet 4.5 <noreply@anthropic.com> Signed-off-by: Robert Young <robertyoungnz@gmail.com>
1 parent 2031213 commit e872ead

41 files changed

Lines changed: 45 additions & 44 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/docker.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ jobs:
6262
echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
6363
else
6464
PROXY_IMAGE="${{ vars.REGISTRY_SERVER }}/${{ vars.REGISTRY_ORGANISATION }}/${{ vars.PROXY_IMAGE_NAME }}"
65+
LEGACY_PROXY_IMAGE="${{ vars.REGISTRY_SERVER }}/${{ vars.REGISTRY_ORGANISATION }}/kroxylicious"
6566
OPERATOR_IMAGE="${{ vars.REGISTRY_SERVER }}/${{ vars.REGISTRY_ORGANISATION }}/${{ vars.OPERATOR_IMAGE_NAME }}"
66-
echo "proxy_tags=${PROXY_IMAGE}:${RELEASE_VERSION}" >> $GITHUB_OUTPUT
67+
echo "proxy_tags=${PROXY_IMAGE}:${RELEASE_VERSION},${LEGACY_PROXY_IMAGE}:${RELEASE_VERSION}" >> $GITHUB_OUTPUT
6768
echo "operator_tags=${OPERATOR_IMAGE}:${RELEASE_VERSION},${OPERATOR_IMAGE}:latest" >> $GITHUB_OUTPUT
6869
echo "push_images=true" >> $GITHUB_OUTPUT
6970
echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT

.github/workflows/documentation-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ jobs:
6464
KROXYLICIOUS_PROXY_IMAGE="$(mvn --quiet --projects :kroxylicious-app --activate-profiles dist org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=io.kroxylicious.proxy.image.name -DforceStdout)"
6565
KROXYLICIOUS_OPERATOR_IMAGE="$(mvn --quiet --projects :kroxylicious-operator --activate-profiles dist org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=io.kroxylicious.operator.image.name -DforceStdout)"
6666
KROXYLICIOUS_VERSION="$(mvn --quiet org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -Dexpression=project.version -DforceStdout)"
67-
minikube image tag ${KROXYLICIOUS_PROXY_IMAGE} quay.io/kroxylicious/kroxylicious:${KROXYLICIOUS_VERSION}
68-
minikube image ls | grep --fixed-strings quay.io/kroxylicious/kroxylicious:${KROXYLICIOUS_VERSION}
67+
minikube image ls | grep --fixed-strings ${KROXYLICIOUS_PROXY_IMAGE}
6968
minikube image ls | grep --fixed-strings ${KROXYLICIOUS_OPERATOR_IMAGE}
7069
- name: 'Run documentation tests'
7170
run: |

.github/workflows/maven.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
GIT_HASH="$(git rev-parse HEAD)"
7676
IMAGE_TAG="dev-git-${GIT_HASH}"
7777
KROXYLICIOUS_VERSION="$(mvn org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=project.version -q -DforceStdout)"
78-
KROXYLICIOUS_IMAGE="quay.io/kroxylicious/kroxylicious:${IMAGE_TAG}"
78+
KROXYLICIOUS_IMAGE="quay.io/kroxylicious/proxy:${IMAGE_TAG}"
7979
echo "KROXYLICIOUS_VERSION=${KROXYLICIOUS_VERSION}" >> "$GITHUB_ENV"
8080
# KROXYLICIOUS_IMAGE env var is used by the Operator ITs
8181
echo "KROXYLICIOUS_IMAGE=${KROXYLICIOUS_IMAGE}" >> "$GITHUB_ENV"

.github/workflows/run-system-tests.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ jobs:
152152
KROXYLICIOUS_PROXY_IMAGE="$(mvn --quiet --projects :kroxylicious-app --activate-profiles dist org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -Dexpression=io.kroxylicious.proxy.image.name -DforceStdout)"
153153
KROXYLICIOUS_OPERATOR_IMAGE="$(mvn --quiet --projects :kroxylicious-operator --activate-profiles dist org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -Dexpression=io.kroxylicious.operator.image.name -DforceStdout)"
154154
KROXYLICIOUS_VERSION="$(mvn --quiet org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -Dexpression=project.version -DforceStdout)"
155-
minikube image tag ${KROXYLICIOUS_PROXY_IMAGE} quay.io/kroxylicious/kroxylicious:${KROXYLICIOUS_VERSION}
156-
minikube image ls | grep --fixed-strings quay.io/kroxylicious/kroxylicious:${KROXYLICIOUS_VERSION}
155+
minikube image ls | grep --fixed-strings ${KROXYLICIOUS_PROXY_IMAGE}
157156
minikube image ls | grep --fixed-strings ${KROXYLICIOUS_OPERATOR_IMAGE}
158157
159158
- name: 'Run system tests'

CHANGELOG.md

Lines changed: 2 additions & 0 deletions

DEV_GUIDE.md

Lines changed: 2 additions & 2 deletions

kroxylicious-docs/release-manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ assets:
2323
path: kroxylicious-operator-$(VERSION).tar.gz
2424
images:
2525
- name: Proxy
26-
url: https://quay.io/repository/kroxylicious/kroxylicious?tab=tags
27-
registry: quay.io/kroxylicious/kroxylicious
26+
url: https://quay.io/repository/kroxylicious/proxy?tab=tags
27+
registry: quay.io/kroxylicious/proxy
2828
tag: $(VERSION)
2929
digest: sha256:REPLACE_WITH_SHA_AFTER_IMAGE_RELEASE
3030
- name: Operator

kroxylicious-kubernetes/kroxylicious-operator/src/main/resources-filtered/kroxylicious-image.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
55
#
66

7-
kroxylicious-image=quay.io/kroxylicious/kroxylicious:${project.version}
7+
kroxylicious-image=quay.io/kroxylicious/proxy:${project.version}

kroxylicious-kubernetes/kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/DerivedResourcesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public Map<String, R> invokeDesired(P primary, Context<P> context) {
177177
}
178178

179179
@TestFactory
180-
@SetEnvironmentVariable(key = KROXYLICIOUS_IMAGE_ENV_VAR, value = "quay.io/kroxylicious/kroxylicious:test")
180+
@SetEnvironmentVariable(key = KROXYLICIOUS_IMAGE_ENV_VAR, value = "quay.io/kroxylicious/proxy:test")
181181
Stream<DynamicContainer> dependentResourcesShouldEqual() {
182182
// Note that the order in this list should reflect the dependency order declared in the ProxyReconciler's
183183
// @ControllerConfiguration annotation, because the statefulness of Context<KafkaProxy> means that

kroxylicious-kubernetes/kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/reconciler/kafkaproxy/ProxyDeploymentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void setUp() {
7070
@ClearEnvironmentVariable(key = KROXYLICIOUS_IMAGE_ENV_VAR)
7171
void operandImageDefault() {
7272
assertThat(ProxyDeploymentDependentResource.getOperandImage())
73-
.matches("^quay.io/kroxylicious/kroxylicious:.*");
73+
.matches("^quay.io/kroxylicious/proxy:.*");
7474
}
7575

7676
@Test

0 commit comments

Comments
 (0)