Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -34,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"
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
10 changes: 5 additions & 5 deletions config/tests/build-test-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -37,13 +37,13 @@ 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}"
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
Expand All @@ -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
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package version

var (
// Version represents the software version of the WildFly Operator
Version = "1.1.3"
Version = "1.1.4"
)