From 3fbbfc60b7614c919caee7050b738d0688963521 Mon Sep 17 00:00:00 2001 From: Yeray Borges Date: Tue, 15 Jul 2025 15:04:23 +0100 Subject: [PATCH 1/5] Next is 1.1.4 --- Makefile | 2 +- .../bases/wildfly-operator.clusterserviceversion.yaml | 10 +++++----- version/version.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fe21038d..0332dcac 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 1.1.3 +VERSION ?= 1.1.4 # The higher Go version expected to be used REQUIRED_GO_MAJOR_VERSION := 1 diff --git a/config/manifests/bases/wildfly-operator.clusterserviceversion.yaml b/config/manifests/bases/wildfly-operator.clusterserviceversion.yaml index b15e3d05..8e5d35c3 100644 --- a/config/manifests/bases/wildfly-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/wildfly-operator.clusterserviceversion.yaml @@ -19,14 +19,14 @@ metadata: capabilities: Seamless Upgrades categories: Application Runtime certified: "false" - containerImage: quay.io/wildfly/wildfly-operator:1.1.3 + containerImage: quay.io/wildfly/wildfly-operator:1.1.4 createdAt: "2025-07-09T12:00:00Z" description: Operator that deploys and manages Java applications running on WildFly. operators.operatorframework.io/builder: operator-sdk-v1.31.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/wildfly/wildfly-operator support: WildFlyServer - name: wildfly-operator.v1.1.3 + name: wildfly-operator.v1.1.4 namespace: placeholder spec: apiservicedefinitions: {} @@ -191,7 +191,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: wildfly-operator - image: quay.io/wildfly/wildfly-operator:1.1.3 + image: quay.io/wildfly/wildfly-operator:1.1.4 imagePullPolicy: Always livenessProbe: httpGet: @@ -359,8 +359,8 @@ spec: minKubeVersion: 1.26.0 provider: name: WildFly - replaces: wildfly-operator.v1.1.2 + replaces: wildfly-operator.v1.1.3 selector: matchLabels: operated-by: wildfly-operator - version: 1.1.3 + version: 1.1.4 diff --git a/version/version.go b/version/version.go index cf7f3e5e..219a6eb0 100644 --- a/version/version.go +++ b/version/version.go @@ -2,5 +2,5 @@ package version var ( // Version represents the software version of the WildFly Operator - Version = "1.1.3" + Version = "1.1.4" ) From 4d47e739b0a8aa388635dc5f16de4038397e6a29 Mon Sep 17 00:00:00 2001 From: Yeray Borges Date: Tue, 16 Dec 2025 13:45:02 +0000 Subject: [PATCH 2/5] Use mirror.gcr.io/eclipse-temurin for Bootable JAR test image --- config/tests/build-test-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tests/build-test-images.sh b/config/tests/build-test-images.sh index 558d0169..44593054 100755 --- a/config/tests/build-test-images.sh +++ b/config/tests/build-test-images.sh @@ -43,7 +43,7 @@ echo "Building bootable JAR image" cp "${BOOTABLE_JAR_REPO_DIR}/${BOOTABLE_JAR}/target/microprofile-config-bootable.jar" "${WORKDIR}" cd "${WORKDIR}" cat << EOF > "${WORKDIR}/Dockerfile" -FROM openjdk:17 +FROM mirror.gcr.io/eclipse-temurin:17 EXPOSE 8080 8778 9779 ENV AB_PROMETHEUS_OFF=true AB_JOLOKIA_OFF=true JAVA_OPTIONS=-Djava.net.preferIPv4Stack=true AB_OFF=true WORKDIR /deployments From f059104814e95b9795a8404e5af8976422da3a69 Mon Sep 17 00:00:00 2001 From: Yeray Borges Date: Tue, 16 Dec 2025 14:04:35 +0000 Subject: [PATCH 3/5] Update wildfly test versions to 38 --- config/tests/build-test-images.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/tests/build-test-images.sh b/config/tests/build-test-images.sh index 44593054..f4dadbed 100755 --- a/config/tests/build-test-images.sh +++ b/config/tests/build-test-images.sh @@ -7,7 +7,7 @@ echo "WORKDIR: ${WORKDIR}" QUICKSTART_REPO_URL=https://github.com/wildfly/quickstart.git QUICKSTART_REPO_DIR="${WORKDIR}/wildfly-operator-quickstart" -QUICKSTART_BRANCH=${1:-"35.0.1.Final"} +QUICKSTART_BRANCH=${1:-"38.0.1.Final"} QUICKSTART=helloworld BOOTABLE_JAR_REPO_URL=https://github.com/wildfly-extras/wildfly-jar-maven-plugin.git @@ -26,7 +26,7 @@ git clone ${QUICKSTART_REPO_URL} "${QUICKSTART_REPO_DIR}" cd "${QUICKSTART_REPO_DIR}" && git checkout ${QUICKSTART_BRANCH} echo "Building quickstart image" -cd "${QUICKSTART_REPO_DIR}"/${QUICKSTART} && mvn -Popenshift package wildfly:image \ +cd "${QUICKSTART_REPO_DIR}"/${QUICKSTART} && mvn -U -Popenshift package wildfly:image \ -Dwildfly.image.name=wildfly/wildfly-test-image \ -Dwildfly.image.tag=0.0 @@ -37,7 +37,7 @@ cd "${BOOTABLE_JAR_REPO_DIR}" && git checkout ${BOOTABLE_JAR_BRANCH} echo "Building Bootable JAR repo" cd "${BOOTABLE_JAR_REPO_DIR}" && git checkout ${BOOTABLE_JAR_BRANCH} -cd "${BOOTABLE_JAR_REPO_DIR}"/${BOOTABLE_JAR} && mvn -Popenshift package +cd "${BOOTABLE_JAR_REPO_DIR}"/${BOOTABLE_JAR} && mvn -U -Popenshift package echo "Building bootable JAR image" cp "${BOOTABLE_JAR_REPO_DIR}/${BOOTABLE_JAR}/target/microprofile-config-bootable.jar" "${WORKDIR}" @@ -59,6 +59,6 @@ cd "${CLUSTER_BENCH_REPO_DIR}" && git checkout ${CLUSTER_BENCH_BRANCH} echo "Building Clusterbench repo" cd "${CLUSTER_BENCH_REPO_DIR}" && git checkout ${CLUSTER_BENCH_BRANCH} -cd "${CLUSTER_BENCH_REPO_DIR}/${CLUSTER_BENCH}" && mvn -Popenshift package wildfly:image \ +cd "${CLUSTER_BENCH_REPO_DIR}/${CLUSTER_BENCH}" && mvn -U -Popenshift package wildfly:image \ -Dwildfly.image.name=wildfly/clusterbench-test-image \ -Dwildfly.image.tag=0.0 From 543b21098809858fb716987d877f57c204d557ec Mon Sep 17 00:00:00 2001 From: Yeray Borges Date: Fri, 9 Jan 2026 15:40:30 +0000 Subject: [PATCH 4/5] Add update action to update base image when building --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5f7e7cca..43befe7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,10 @@ RUN echo "FLAGS: $GO_LDFLAGS" RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager -ldflags="${GO_LDFLAGS}" main.go FROM registry.access.redhat.com/ubi9/ubi-minimal:latest + +RUN microdnf update -y --nodocs --setopt=install_weak_deps=0 && \ + microdnf clean all + ENV OPERATOR=/usr/local/bin/wildfly-operator \ JBOSS_HOME=/opt/wildfly \ JBOSS_BOOTABLE_HOME=/opt/jboss/container/wildfly-bootable-jar-server \ From 8b385b1217dc151d035c1aa19ba8233e02d9e308 Mon Sep 17 00:00:00 2001 From: Yeray Borges Date: Fri, 9 Jan 2026 15:48:42 +0000 Subject: [PATCH 5/5] Minor improvements on Dockerfile base image --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43befe7f..dd7ddcdc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,9 +38,14 @@ ENV OPERATOR=/usr/local/bin/wildfly-operator \ WORKDIR / COPY --from=builder /workspace/manager ${OPERATOR} -COPY build/bin /usr/local/bin +COPY --chmod=0755 build/bin /usr/local/bin RUN /usr/local/bin/user_setup USER ${USER_UID} ENTRYPOINT ["/usr/local/bin/entrypoint"] + +LABEL name="Wildfly Operator" \ + vendor="Red Hat" \ + summary="A Kubernetes Operator for Wildfly" \ + description="This operator manages Wildfly instances on Kubernetes" \ No newline at end of file