diff --git a/.github/actions/make-bundle/action.yml b/.github/actions/make-bundle/action.yml index 2416845c..59a7c50d 100644 --- a/.github/actions/make-bundle/action.yml +++ b/.github/actions/make-bundle/action.yml @@ -33,10 +33,6 @@ inputs: description: "image uri for tackle-ui (ie. quay.io//:)" required: false default: "" - addon_admin: - description: "image uri for admin addon (ie. quay.io//:)" - required: false - default: "" addon_analyzer: description: "image uri for analyzer addon (ie. quay.io//:)" required: false @@ -68,7 +64,6 @@ runs: [ -n "${{ inputs.keycloak_sso }}" ] && OPTS+=" --set images.keycloak_sso=${{ inputs.keycloak_sso }}" [ -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_admin }}" ] && OPTS+=" --set images.addon_admin=${{ inputs.addon_admin }}" [ -n "${{ inputs.addon_analyzer }}" ] && OPTS+=" --set images.addon_analyzer=${{ inputs.addon_analyzer }}" HELM_OPTS="${OPTS}" make bundle cat ./bundle/manifests/konveyor-operator.clusterserviceversion.yaml diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index fdaf3669..f32754f6 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -113,7 +113,7 @@ jobs: - repo: konveyor/tackle2-ui image: konveyor/tackle2-ui - repo: konveyor/tackle2-addon - image: konveyor/tackle2-addon + image: '' - repo: konveyor/operator image: konveyor/tackle2-operator - repo: konveyor/tackle-keycloak-theme @@ -129,7 +129,8 @@ jobs: repository: ${{ matrix.projects.repo }} ref: ${{ inputs.branch }} github_token: ${{ secrets.GH_TOKEN }} - - run: | + - if: ${{ matrix.projects.image != '' }} + run: | #!/bin/bash while ! docker pull quay.io/${{ matrix.projects.image }}:${{ inputs.version }} &> /dev/null; do sleep 3m diff --git a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml index d87c6647..106f9722 100644 --- 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: "2023-11-02T15:35:48Z" + createdAt: "2024-02-14T17:22:48Z" description: Konveyor is an open-source application modernization platform that helps organizations safely and predictably modernize applications to Kubernetes at scale. @@ -176,8 +176,6 @@ spec: value: quay.io/konveyor/tackle-keycloak-init:latest - name: RELATED_IMAGE_TACKLE_UI value: quay.io/konveyor/tackle2-ui:latest - - name: RELATED_IMAGE_ADDON_ADMIN - value: quay.io/konveyor/tackle2-addon:latest - name: RELATED_IMAGE_ADDON_ANALYZER value: quay.io/konveyor/tackle2-addon-analyzer:latest image: quay.io/konveyor/tackle2-operator:latest @@ -364,8 +362,6 @@ spec: name: keycloak-init - image: quay.io/konveyor/tackle2-ui:latest name: tackle-ui - - image: quay.io/konveyor/tackle2-addon:latest - name: addon-admin - image: quay.io/konveyor/tackle2-addon-analyzer:latest name: addon-analyzer version: 99.0.0 diff --git a/hack/install-tackle.sh b/hack/install-tackle.sh index f22b8f36..b0d04e26 100755 --- a/hack/install-tackle.sh +++ b/hack/install-tackle.sh @@ -22,7 +22,6 @@ OPERATOR_BUNDLE_IMAGE="${OPERATOR_BUNDLE_IMAGE:-quay.io/konveyor/tackle2-operato HUB_IMAGE="${HUB_IMAGE:-quay.io/konveyor/tackle2-hub:latest}" UI_IMAGE="${UI_IMAGE:-quay.io/konveyor/tackle2-ui:latest}" UI_INGRESS_CLASS_NAME="${UI_INGRESS_CLASS_NAME:-nginx}" -ADDON_ADMIN_IMAGE="${ADDON_ADMIN_IMAGE:-quay.io/konveyor/tackle2-addon:latest}" ADDON_ANALYZER_IMAGE="${ADDON_ANALYZER_IMAGE:-quay.io/konveyor/tackle2-addon-analyzer:latest}" IMAGE_PULL_POLICY="${IMAGE_PULL_POLICY:-Always}" ANALYZER_CONTAINER_REQUESTS_MEMORY="${ANALYZER_CONTAINER_REQUESTS_MEMORY:-0}" @@ -74,7 +73,6 @@ spec: hub_image_fqin: ${HUB_IMAGE} ui_image_fqin: ${UI_IMAGE} ui_ingress_class_name: ${UI_INGRESS_CLASS_NAME} - admin_fqin: ${ADDON_ADMIN_IMAGE} analyzer_fqin: ${ADDON_ANALYZER_IMAGE} image_pull_policy: ${IMAGE_PULL_POLICY} analyzer_container_requests_memory: ${ANALYZER_CONTAINER_REQUESTS_MEMORY} diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 06549732..0476802d 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -47,8 +47,6 @@ spec: value: {{ .Values.images.keycloak_init }} - name: RELATED_IMAGE_TACKLE_UI value: {{ .Values.images.tackle_ui }} - - name: RELATED_IMAGE_ADDON_ADMIN - value: {{ .Values.images.addon_admin }} - name: RELATED_IMAGE_ADDON_ANALYZER value: {{ .Values.images.addon_analyzer }} name: tackle-operator diff --git a/helm/values.yaml b/helm/values.yaml index f1005795..b5d687c3 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -18,5 +18,4 @@ images: keycloak_sso: quay.io/keycloak/keycloak:18.0.2-legacy keycloak_init: quay.io/konveyor/tackle-keycloak-init:latest tackle_ui: quay.io/konveyor/tackle2-ui:latest - addon_admin: quay.io/konveyor/tackle2-addon:latest addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:latest diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml index 385465da..0f4c6804 100644 --- a/roles/tackle/defaults/main.yml +++ b/roles/tackle/defaults/main.yml @@ -149,13 +149,6 @@ oauth_access_rule: "{{ oauth_default_openshift_sar if oauth_provider == 'openshi oauth_image_fqin: "{{ lookup('env', 'RELATED_IMAGE_OAUTH_PROXY') }}" oauth_ssl_port: 9443 -admin_fqin: "{{ lookup('env', 'RELATED_IMAGE_ADDON_ADMIN') }}" -admin_name: "admin" -admin_component_name: "addon" -admin_service_name: "{{ app_name }}-{{ admin_name }}-{{ admin_component_name }}" -admin_container_requests_cpu: "50m" -admin_container_requests_memory: "50Mi" - analyzer_fqin: "{{ lookup('env', 'RELATED_IMAGE_ADDON_ANALYZER') }}" analyzer_name: "analyzer" analyzer_component_name: "addon"