✨ Update release and CI workflows for discovery addon (#342)

Signed-off-by: Dylan Murray <dymurray@redhat.com>
konveyor · Jun 21, 2024 · f52fdad · f52fdad
1 parent c5d61de
commit f52fdad
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 2 deletions.
diff --git a/.github/actions/make-bundle/action.yml b/.github/actions/make-bundle/action.yml
@@ -37,6 +37,10 @@ inputs:
     description: "image uri for analyzer addon (ie. quay.io/<namespace>/<image-name>:<tag>)"
     required: false
     default: ""
+  addon_discovery:
+    description: "image uri for discovery addon (ie. quay.io/<namespace>/<image-name>:<tag>)"
+    required: false
+    default: ""
   version:
     description: "operator version"
     required: false
@@ -65,6 +69,7 @@ runs:
       [ -n "${{ inputs.keycloak_init }}" ] && OPTS+=" --set images.keycloak_init=${{ inputs.keycloak_init }}"
       [ -n "${{ inputs.tackle_ui }}" ] && OPTS+=" --set images.tackle_ui=${{ inputs.tackle_ui }}"
       [ -n "${{ inputs.addon_analyzer }}" ] && OPTS+=" --set images.addon_analyzer=${{ inputs.addon_analyzer }}"
+      [ -n "${{ inputs.addon_discovery }}" ] && OPTS+=" --set images.addon_discovery=${{ inputs.addon_discovery }}"
       HELM_OPTS="${OPTS}" make bundle
       cat ./bundle/manifests/konveyor-operator.clusterserviceversion.yaml
       make bundle-build

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -109,6 +109,21 @@ jobs:
               sleep 3m
           done
           docker image inspect quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }}
+      - name: tackle2-addon-discovery
+        uses: konveyor/release-tools/create-release@main
+        with:
+          version: ${{ inputs.version }}
+          prev_version: ${{ inputs.previous_version }}
+          repository: konveyor/tackle2-addon-discovery
+          ref: ${{ inputs.branch }}
+          github_token: ${{ secrets.GH_TOKEN }}
+      - name: wait for tackle2-addon-discovery
+        run: |
+          #!/bin/bash
+          while ! docker pull quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }} &> /dev/null; do
+              sleep 3m
+          done
+          docker image inspect quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }}
 
   release-components:
     runs-on: ubuntu-20.04
@@ -155,6 +170,7 @@ jobs:
       keycloak_init: quay.io/konveyor/tackle-keycloak-init:${{ inputs.version }}
       tackle_ui: quay.io/konveyor/tackle2-ui:${{ inputs.version }}
       addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }}
+      addon_discovery: quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }}
       api_tests_ref: ${{ inputs.branch }}
       ui_tests_ref: ${{ inputs.branch }}
 
@@ -211,6 +227,7 @@ jobs:
         keycloak_init: quay.io/konveyor/tackle-keycloak-init:${{ inputs.version }}
         tackle_ui: quay.io/konveyor/tackle2-ui:${{ inputs.version }}
         addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }}
+        addon_discovery: quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }}
         # The ones we don't own
         oauth_proxy: quay.io/konveyor/origin-oauth-proxy:${{ inputs.version }}
         tackle_postgres: quay.io/konveyor/postgresql-15-c9s:${{ inputs.version }}
@@ -303,6 +320,7 @@ jobs:
           "konveyor/java-analyzer-bundle"
           "konveyor/windup-shim"
           "konveyor/tackle2-addon-analyzer"
+          "konveyor/tackle2-addon-discovery"
           "konveyor/tackle2-addon"
           "konveyor/operator"
         )

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.28.1
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.2
 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-17T20:49:11Z"
+    createdAt: "2024-06-21T13:13:06Z"
     description: Konveyor is an open-source application modernization platform that
       helps organizations safely and predictably modernize applications to Kubernetes
       at scale.
@@ -208,6 +208,8 @@ spec:
                   value: quay.io/konveyor/tackle2-ui:latest
                 - name: RELATED_IMAGE_ADDON_ANALYZER
                   value: quay.io/konveyor/tackle2-addon-analyzer:latest
+                - name: RELATED_IMAGE_ADDON_DISCOVERY
+                  value: quay.io/konveyor/tackle2-addon-discovery:latest
                 - name: RELATED_IMAGE_PROVIDER_GENERIC
                   value: quay.io/konveyor/generic-external-provider:latest
                 - name: RELATED_IMAGE_PROVIDER_JAVA
@@ -400,6 +402,8 @@ spec:
     name: tackle-ui
   - image: quay.io/konveyor/tackle2-addon-analyzer:latest
     name: addon-analyzer
+  - image: quay.io/konveyor/tackle2-addon-discovery:latest
+    name: addon-discovery
   - image: quay.io/konveyor/generic-external-provider:latest
     name: provider-generic
   - image: quay.io/konveyor/java-external-provider:latest

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -49,6 +49,8 @@ spec:
           value: {{ .Values.images.tackle_ui }}
         - name: RELATED_IMAGE_ADDON_ANALYZER
           value: {{ .Values.images.addon_analyzer }}
+        - name: RELATED_IMAGE_ADDON_DISCOVERY
+          value: {{ .Values.images.addon_discovery }}
         - name: RELATED_IMAGE_PROVIDER_GENERIC
           value: {{ .Values.images.provider_generic }}
         - name: RELATED_IMAGE_PROVIDER_JAVA

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -19,5 +19,6 @@ images:
   keycloak_init: quay.io/konveyor/tackle-keycloak-init:latest
   tackle_ui: quay.io/konveyor/tackle2-ui:latest
   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