From 0209206960b51e17e2036a55812eb074fc2f477b Mon Sep 17 00:00:00 2001 From: Carlos Feria Date: Sun, 6 Oct 2024 12:18:32 +0200 Subject: [PATCH] task: Update README & upgrade deps (#30) --- README.md | 4 +--- bundle.Dockerfile | 8 +++++--- pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f4c5e8a..e991de7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ```shell minikube start --addons=ingress,dashboard -curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.22.0/install.sh | bash -s v0.22.0 +curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.22.0/install.sh | bash -s v0.28.0 ``` - Setup ServiceAccount + Role + RoleBinding: @@ -37,8 +37,6 @@ export BUNDLE_IMG=quay.io/${USER}/trustify-operator-bundle:v0.0.0 export CATALOG_IMG=quay.io/${USER}/trustify-operator-catalog:v0.0.0 ``` -> use `export DOCKERFILE=Dockerfile.jvm` if you want to be faster and create an operator based on JVM - - Create operator: ```shell diff --git a/bundle.Dockerfile b/bundle.Dockerfile index a6567cc..18a85f8 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -20,8 +20,10 @@ RUN dnf install curl zip unzip --allowerasing -y && \ source "$HOME/.sdkman/bin/sdkman-init.sh" && \ sdk install java && \ sdk install groovy && \ - groovy scripts/enrichCSV.groovy /code/target/bundle/trustify-operator/manifests/trustify-operator.clusterserviceversion.yaml && \ - echo ' com.redhat.openshift.versions: "v4.10"' >> /code/target/bundle/trustify-operator/metadata/annotations.yaml + groovy scripts/enrichCSV.groovy /code/target/bundle/trustify-operator/manifests/trustify-operator.clusterserviceversion.yaml +RUN curl --output /usr/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 && \ + chmod +x /usr/bin/yq && \ + yq e -P -i '.annotations."com.redhat.openshift.versions"="v4.10"' FROM scratch ARG CHANNELS=alpha @@ -33,7 +35,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=trustify-operator -LABEL operators.operatorframework.io.metrics.builder=qosdk-bundle-generator/6.6.6+6212e1b +LABEL operators.operatorframework.io.metrics.builder=qosdk-bundle-generator/6.8.2+5def15d LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=quarkus.javaoperatorsdk.io/v1-alpha diff --git a/pom.xml b/pom.xml index d6f1946..b6918a3 100644 --- a/pom.xml +++ b/pom.xml @@ -13,11 +13,11 @@ UTF-8 quarkus-bom io.quarkus.platform - 3.14.2 + 3.15.1 true 3.2.5 - 6.8.0 + 6.8.2