Fix conflicting values for discovery addon

Signed-off-by: Sam Lucidi <slucidi@redhat.com>
konveyor · Jun 21, 2024 · f4d2b9c · f4d2b9c
1 parent 1d82a89
commit f4d2b9c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=konveyor-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=development
 LABEL operators.operatorframework.io.bundle.channel.default.v1=development
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.2
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=ansible.sdk.operatorframework.io/v1
 

diff --git a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml
@@ -20,7 +20,7 @@ metadata:
     categories: Modernization & Migration
     certified: "false"
     containerImage: quay.io/konveyor/tackle2-operator:latest
-    createdAt: "2024-06-21T13:13:06Z"
+    createdAt: "2024-06-21T13:51:01Z"
     description: Konveyor is an open-source application modernization platform that
       helps organizations safely and predictably modernize applications to Kubernetes
       at scale.
@@ -214,8 +214,6 @@ spec:
                   value: quay.io/konveyor/generic-external-provider:latest
                 - name: RELATED_IMAGE_PROVIDER_JAVA
                   value: quay.io/konveyor/java-external-provider:latest
-                - name: RELATED_IMAGE_ADDON_LANGUAGE_DISCOVERY
-                  value: quay.io/konveyor/tackle2-addon-discovery:latest
                 image: quay.io/konveyor/tackle2-operator:latest
                 imagePullPolicy: Always
                 livenessProbe:
@@ -410,6 +408,4 @@ spec:
     name: provider-generic
   - image: quay.io/konveyor/java-external-provider:latest
     name: provider-java
-  - image: quay.io/konveyor/tackle2-addon-discovery:latest
-    name: addon-language-discovery
   version: 99.0.0
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -55,8 +55,6 @@ spec:
           value: {{ .Values.images.provider_generic }}
         - name: RELATED_IMAGE_PROVIDER_JAVA
           value: {{ .Values.images.provider_java }}
-        - name: RELATED_IMAGE_ADDON_LANGUAGE_DISCOVERY
-          value: {{ .Values.images.addon_language_discovery }}
         name: tackle-operator
         image: {{ .Values.images.operator }}
         imagePullPolicy: Always

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -21,5 +21,4 @@ images:
   addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:latest
   addon_discovery: quay.io/konveyor/tackle2-addon-discovery:latest
   provider_generic: quay.io/konveyor/generic-external-provider:latest
-  provider_java: quay.io/konveyor/java-external-provider:latest
-  addon_language_discovery: quay.io/konveyor/tackle2-addon-discovery:latest
+  provider_java: quay.io/konveyor/java-external-provider:latest
diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml
@@ -180,7 +180,7 @@ provider_java_image_fqin: "{{ lookup('env', 'RELATED_IMAGE_PROVIDER_JAVA') }}"
 provider_java_name: "java"
 provider_java_service_name: "{{ app_name }}-{{ provider_java_name }}-{{ analyzer_component_name }}"
 
-language_discovery_fqin: "{{ lookup('env', 'RELATED_IMAGE_ADDON_LANGUAGE_DISCOVERY') }}"
+language_discovery_fqin: "{{ lookup('env', 'RELATED_IMAGE_ADDON_DISCOVERY') }}"
 language_discovery_name: "language-discovery"
 language_discovery_component_name: "addon"
 language_discovery_service_name: "{{ app_name }}-{{ language_discovery_name }}-{{ language_discovery_component_name }}"