diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8f22dec7..5acbed2d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -66,7 +66,7 @@ jobs:
-Dquarkus.container-image.name=ublhub \
-Dquarkus.container-image.tag=latest \
-P native,ui \
- -f application
+ -pl application
# Identify major version
major=$(echo "${{ github.event.inputs.version }}" | cut -d. -f1)
@@ -136,7 +136,7 @@ jobs:
-Dquarkus.operator-sdk.bundle.channels=alpha \
-Doperator.ublhub.image=quay.io/projectopenubl/ublhub:v${{ github.event.inputs.version }} \
-P native \
- -f operator
+ -pl operator
# Tag images
docker tag quay.io/projectopenubl/ublhub-operator:latest quay.io/projectopenubl/ublhub-operator:v${{ github.event.inputs.version }}
@@ -167,7 +167,7 @@ jobs:
-Doperator.ublhub.image=quay.io/projectopenubl/ublhub:v${{ github.event.inputs.version }} \
-Dquarkus.operator-sdk.bundle.package-name=ublhub-operator \
-Dquarkus.operator-sdk.bundle.channels=alpha \
- -f operator
+ -pl operator
groovy scripts/enrichCSV.groovy \
operator/target/bundle/ublhub-operator/manifests/ublhub-operator.clusterserviceversion.yaml \
@@ -200,7 +200,7 @@ jobs:
distribution: temurin
cache: maven
- name: Build distribution
- run: mvn package -DskipTests -P ui,distribution -f application
+ run: mvn package -DskipTests -P ui,distribution -pl application
- name: JReleaser - release
uses: jreleaser/release-action@v2
diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml
index cf461e51..511ca3a9 100644
--- a/.github/workflows/snapshots.yml
+++ b/.github/workflows/snapshots.yml
@@ -31,7 +31,7 @@ jobs:
-Dquarkus.container-image.name=ublhub \
-Dquarkus.container-image.tag=latest \
-P native,ui \
- -f application
+ -pl application
- name: Save container image
run: docker save -o ublhub-container-image.tar quay.io/projectopenubl/ublhub:latest
- name: Upload container image
@@ -60,7 +60,7 @@ jobs:
-Dquarkus.container-image.name=ublhub-operator \
-Dquarkus.container-image.tag=latest \
-P native \
- -f operator
+ -pl operator
- name: Save container image
run: docker save -o ublhub-operator-container-image.tar quay.io/projectopenubl/ublhub-operator:latest
- name: Upload container image
diff --git a/operator/README.md b/operator/README.md
index 361ded8a..c1f2de6e 100644
--- a/operator/README.md
+++ b/operator/README.md
@@ -90,19 +90,19 @@ mvn clean package \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=false \
-Dquarkus.container-image.registry=quay.io \
--Dquarkus.container-image.group=projectopenubl \
+-Dquarkus.container-image.group=$USER \
-Dquarkus.container-image.name=ublhub-operator \
--Dquarkus.container-image.tag=nightly \
-Dquarkus.operator-sdk.bundle.package-name=ublhub-operator \
-Dquarkus.operator-sdk.bundle.channels=alpha \
+-Dquarkus.application.version=test \
-P native
-podman push quay.io/projectopenubl/ublhub-operator:nightly
+podman push quay.io/$USER/ublhub-operator:test
```
Create bundle:
```shell
-BUNDLE_IMAGE=quay.io/$USER/ublhub-operator-bundle:nightly
+BUNDLE_IMAGE=quay.io/$USER/ublhub-operator-bundle:test
podman build -t $BUNDLE_IMAGE -f target/bundle/ublhub-operator/bundle.Dockerfile target/bundle/ublhub-operator
podman push $BUNDLE_IMAGE
```
@@ -110,7 +110,7 @@ podman push $BUNDLE_IMAGE
Create catalog image:
```shell
-CATALOG_IMAGE=quay.io/$USER/ublhub-operator-catalog:nightly
+CATALOG_IMAGE=quay.io/$USER/ublhub-operator-catalog:test
opm index add \
--bundles $BUNDLE_IMAGE \
--tag $CATALOG_IMAGE \
diff --git a/operator/pom.xml b/operator/pom.xml
index 8b769df4..9227a56b 100644
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -63,6 +63,14 @@
io.quarkus
quarkus-resteasy-reactive
+
+ io.quarkus
+ quarkus-smallrye-health
+
+
+ io.quarkus
+ quarkus-container-image-jib
+
io.quarkiverse.operatorsdk
diff --git a/operator/src/main/java/io/github/project/openubl/operator/UblhubOperatorCSVMetadata.java b/operator/src/main/java/io/github/project/openubl/operator/UblhubOperatorCSVMetadata.java
index f5b0760a..cfb839b1 100644
--- a/operator/src/main/java/io/github/project/openubl/operator/UblhubOperatorCSVMetadata.java
+++ b/operator/src/main/java/io/github/project/openubl/operator/UblhubOperatorCSVMetadata.java
@@ -45,6 +45,12 @@
"key": "password"
},
"url": "jdbc:postgresql://postgresql-primary.default.svc:5432/ublhubdb"
+ },
+ "storage": {
+ "type": "filesystem",
+ "filesystem": {
+ "size": "1Gi"
+ }
}
}
}]