Revert ":seedling: pin provider images in our release artifacts (konv…

…eyor#347)" This reverts commit 63d8d3a.
djzager · Jul 3, 2024 · 250323d · 250323d
1 parent cd6ad20
commit 250323d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/.github/actions/make-bundle/action.yml b/.github/actions/make-bundle/action.yml
@@ -41,14 +41,6 @@ inputs:
     description: "image uri for discovery addon (ie. quay.io/<namespace>/<image-name>:<tag>)"
     required: false
     default: ""
-  provider_generic:
-    description: "image uri for generic provider (ie. quay.io/<namespace>/<image-name>:<tag>)"
-    required: false
-    default: ""
-  provider_java:
-    description: "image uri for generic provider (ie. quay.io/<namespace>/<image-name>:<tag>)"
-    required: false
-    default: ""
   version:
     description: "operator version"
     required: false
@@ -78,8 +70,6 @@ runs:
       [ -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 }}"
-      [ -n "${{ inputs.provider_generic }}" ] && OPTS+=" --set images.provider_generic=${{ inputs.provider_generic }}"
-      [ -n "${{ inputs.provider_java }}" ] && OPTS+=" --set images.provider_java=${{ inputs.provider_java }}"
       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
@@ -216,8 +216,6 @@ jobs:
         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 }}
-        provider_generic: quay.io/konveyor/generic-external-provider:${{ inputs.version }}
-        provider_java: quay.io/konveyor/java-external-provider:${{ 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 }}
@@ -269,6 +267,11 @@ jobs:
     uses: konveyor/ci/.github/workflows/global-ci-bundle.yml@main
     with:
       operator_bundle: quay.io/konveyor/tackle2-operator-bundle:${{ inputs.version }}
+      tackle_hub: quay.io/konveyor/tackle2-hub:${{ inputs.version }}
+      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 }}