From e37473dd060d043367f2f17a89622670547ef7d2 Mon Sep 17 00:00:00 2001
From: Michael Edgar <medgar@redhat.com>
Date: Thu, 18 Jul 2024 15:21:24 -0400
Subject: [PATCH] fix: resolve container-image label and Strimzi API index
 warnings

Signed-off-by: Michael Edgar <medgar@redhat.com>
---
 api/pom.xml                                        | 1 +
 api/src/main/resources/application.properties      | 7 +++++--
 operator/pom.xml                                   | 1 +
 operator/src/main/resources/application.properties | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index d2ee65918..696da8f68 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -378,6 +378,7 @@
         <profile>
             <id>container-image</id>
             <properties>
+                <quarkus.profile>build</quarkus.profile>
                 <quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile</quarkus.docker.dockerfile-jvm-path>
                 <quarkus.container-image.build>true</quarkus.container-image.build>
                 <quarkus.container-image.registry>${docker.registry}</quarkus.container-image.registry>
diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
index 25f7a686b..6f2baaade 100644
--- a/api/src/main/resources/application.properties
+++ b/api/src/main/resources/application.properties
@@ -41,8 +41,8 @@ quarkus.swagger-ui.title=Console API
 
 quarkus.log.category."org.apache.kafka".level=ERROR
 
-quarkus.container-image.labels."org.opencontainers.image.version"=${quarkus.application.version}
-quarkus.container-image.labels."org.opencontainers.image.revision"=${git.revision}
+%build.quarkus.container-image.labels."org.opencontainers.image.version"=${quarkus.application.version}
+%build.quarkus.container-image.labels."org.opencontainers.image.revision"=${git.revision}
 
 #
 # A Quarkus optimization may remove a CDI bean that is not directly used.
@@ -54,6 +54,9 @@ quarkus.container-image.labels."org.opencontainers.image.revision"=${git.revisio
 # eligible for access from a CDI `Instance`.
 quarkus.arc.unremovable-types=com.github.streamshub.console.api.**
 
+quarkus.index-dependency.strimzi-api.group-id=io.strimzi
+quarkus.index-dependency.strimzi-api.artifact-id=api
+
 console.kafka.admin.request.timeout.ms=10000
 console.kafka.admin.default.api.timeout.ms=10000
 
diff --git a/operator/pom.xml b/operator/pom.xml
index 58183b0e6..de03a58f0 100644
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -196,6 +196,7 @@
         <profile>
             <id>container-image</id>
             <properties>
+                <quarkus.profile>build</quarkus.profile>
                 <quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile</quarkus.docker.dockerfile-jvm-path>
                 <quarkus.container-image.build>true</quarkus.container-image.build>
                 <quarkus.container-image.registry>${container-image.registry}</quarkus.container-image.registry>
diff --git a/operator/src/main/resources/application.properties b/operator/src/main/resources/application.properties
index 8a666c0a9..0884f8bfc 100644
--- a/operator/src/main/resources/application.properties
+++ b/operator/src/main/resources/application.properties
@@ -7,6 +7,9 @@ quarkus.container-image.name=console-operator
 quarkus.operator-sdk.activate-leader-election-for-profiles=prod
 quarkus.operator-sdk.controllers."consolereconciler".selector=${console.selector}
 
+%build.quarkus.container-image.labels."org.opencontainers.image.version"=${quarkus.application.version}
+%build.quarkus.container-image.labels."org.opencontainers.image.revision"=${git.revision}
+
 # set to true to automatically apply CRDs to the cluster when they get regenerated
 %dev.quarkus.operator-sdk.crd.apply=true
 %test.quarkus.operator-sdk.crd.apply=true