diff --git a/operator/scripts/create-olm-bundle.sh b/operator/scripts/create-olm-bundle.sh index f94879402c1..0fac9c1cb36 100755 --- a/operator/scripts/create-olm-bundle.sh +++ b/operator/scripts/create-olm-bundle.sh @@ -67,7 +67,6 @@ yq ea -i '.spec.apiservicedefinitions = {}' "$CSV_PATH" yq ea -i '.spec.install.spec.deployments[0].spec.selector.matchLabels.name = "keycloak-operator"' "$CSV_PATH" yq ea -i '.spec.install.spec.deployments[0].spec.template.metadata.labels.name = "keycloak-operator"' "$CSV_PATH" -yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].env += [{"name": "QUARKUS_OPERATOR_SDK_NAMESPACES", "valueFrom": {"fieldRef": {"fieldPath": "metadata.annotations['"'"'olm.targetNamespaces'"'"']"}}}]' "$CSV_PATH" yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].env += [{"name": "POD_NAME", "valueFrom": {"fieldRef": {"fieldPath": "metadata.name"}}}]' "$CSV_PATH" yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].env += [{"name": "OPERATOR_NAME", "value": "keycloak-operator"}]' "$CSV_PATH" diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java index 0465cfc86da..211e8ee4a4c 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java @@ -16,8 +16,8 @@ */ package org.keycloak.operator.controllers; -import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata; -import io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata; +import io.quarkiverse.operatorsdk.annotations.CSVMetadata; +import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata; @CSVMetadata( version = "KCOP_NEXT", diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java index 69e97a1e041..8ba30f13896 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java @@ -22,7 +22,7 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Plural; import io.fabric8.kubernetes.model.annotation.ShortNames; import io.fabric8.kubernetes.model.annotation.Version; -import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata; +import io.quarkiverse.operatorsdk.annotations.CSVMetadata; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import org.keycloak.operator.Constants; diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java index 9e8455a2d79..1bc7724d845 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java @@ -23,7 +23,7 @@ import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata; +import io.quarkiverse.operatorsdk.annotations.CSVMetadata; import org.keycloak.operator.Constants; import org.keycloak.representations.idm.ComponentExportRepresentation; import org.keycloak.representations.idm.GroupRepresentation; diff --git a/pom.xml b/pom.xml index 8556d643f60..3a933dbd0a6 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,8 @@ jboss-snapshots-repository https://s01.oss.sonatype.org/content/repositories/snapshots/ - 3.2.7.Final - 3.2.7.Final + 3.2.9.Final + 3.2.9.Final ${timestamp} @@ -92,9 +92,9 @@ 3.3.10 3.3.10 2.1.3 - 2.2.220 - 6.2.7.Final - 6.2.7.Final + 2.2.224 + 6.2.13.Final + 6.2.13.Final 14.0.19.Final 4.6.5.Final