🐛 tackle2-addon is no longer deployed (#304) (#305)

Signed-off-by: David Zager <[email protected]>
konveyor · Feb 15, 2024 · a655b3b · a655b3b
1 parent dd3ac9d
commit a655b3b
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 27 deletions.
diff --git a/.github/actions/install-tackle/action.yml b/.github/actions/install-tackle/action.yml
@@ -14,10 +14,6 @@ inputs:
     description: "image url for tackle-ui"
     required: false
     default: "quay.io/konveyor/tackle2-ui:latest"
-  addon-admin-image:
-    description: "image urd for admin addon"
-    required: false
-    default: "quay.io/konveyor/tackle2-addon:latest"
   addon-analyzer-image:
     description: "image url for analyzer addon"
     required: false
@@ -44,7 +40,6 @@ runs:
       export OPERATOR_BUNDLE_IMAGE="${{ inputs.operator-bundle-image }}"
       export HUB_IMAGE="${{ inputs.hub-image }}"
       export UI_IMAGE="${{ inputs.ui-image }}"
-      export ADDON_ADMIN_IMAGE="${{ inputs.addon-admin-image }}"
       export ADDON_ANALYZER_IMAGE="${{ inputs.addon-analyzer-image }}"
       export IMAGE_PULL_POLICY="${{ inputs.image-pull-policy }}"
       export ANALYZER_CONTAINER_REQUESTS_MEMORY="${{ inputs.analyzer-container-memory }}"

diff --git 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/<namespace>/<image-name>:<tag>)"
     required: false
     default: ""
-  addon_admin:
-    description: "image uri for admin addon (ie. quay.io/<namespace>/<image-name>:<tag>)"
-    required: false
-    default: ""
   addon_analyzer:
     description: "image uri for analyzer addon (ie. quay.io/<namespace>/<image-name>:<tag>)"
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -149,12 +149,7 @@ 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"