From 019873ee851c35d3235103bc18bf86b60356522e Mon Sep 17 00:00:00 2001 From: David Zager Date: Mon, 24 Jul 2023 08:59:09 -0400 Subject: [PATCH] Revert ":sparkles: Replace windup with analyzer-lsp (#249)" This reverts commit 21e7d16dc8a51656f145e2ebb8bc7c572b44189b. --- .github/actions/install-tackle/action.yml | 20 ++--- .github/workflows/create-release.yml | 4 +- ...nveyor-operator.clusterserviceversion.yaml | 21 +++-- config/manager/manager.yaml | 4 +- config/samples/kustomization.yaml | 1 + config/samples/tackle_v1alpha1_addon.yaml | 7 ++ hack/install-tackle.sh | 12 +-- roles/tackle/defaults/main.yml | 28 +++---- roles/tackle/tasks/main.yml | 9 ++- .../templates/configmap-hub-seed.yml.j2 | 77 +++++++++++++++++++ .../customresource-addon-analyzer.yml.j2 | 20 ----- .../customresource-addon-windup.yml.j2 | 20 +++++ roles/tackle/templates/deployment-hub.yml.j2 | 2 + tools/templates/clusterserviceversion.yaml.j2 | 8 +- 14 files changed, 169 insertions(+), 64 deletions(-) create mode 100644 config/samples/tackle_v1alpha1_addon.yaml create mode 100644 roles/tackle/templates/configmap-hub-seed.yml.j2 delete mode 100644 roles/tackle/templates/customresource-addon-analyzer.yml.j2 create mode 100644 roles/tackle/templates/customresource-addon-windup.yml.j2 diff --git a/.github/actions/install-tackle/action.yml b/.github/actions/install-tackle/action.yml index 6469ddb..7d7fbd7 100644 --- a/.github/actions/install-tackle/action.yml +++ b/.github/actions/install-tackle/action.yml @@ -22,20 +22,20 @@ inputs: description: "image urd for admin addon" required: false default: "quay.io/konveyor/tackle2-addon:latest" - tackle-addon-analyzer-image: - description: "image url for analyzer addon" + tackle-addon-windup-image: + description: "image url for windup addon" required: false - default: "quay.io/konveyor/tackle2-addon-analyzer:latest" + default: "quay.io/konveyor/tackle2-addon-windup:latest" tackle-image-pull-policy: description: "Image Pull Policy" required: false default: "Always" - tackle-analyzer-container-cpu: - description: "The CPU request value for the analyzer task containers" + tackle-windup-container-cpu: + description: "The CPU request value for the windup task containers" required: false default: 0 - tackle-analyzer-container-memory: - description: "The memory request value for the analyzer task containers" + tackle-windup-container-memory: + description: "The memory request value for the windup task containers" required: false default: 0 # TODO(djzager): uncomment when supported @@ -55,10 +55,10 @@ runs: export TACKLE_PATHFINDER_IMAGE="${{ inputs.tackle-pathfinder-image }}" export TACKLE_UI_IMAGE="${{ inputs.tackle-ui-image }}" export TACKLE_ADDON_ADMIN_IMAGE="${{ inputs.tackle-addon-admin-image }}" - export TACKLE_ADDON_ANALYZER_IMAGE="${{ inputs.tackle-addon-analyzer-image }}" + export TACKLE_ADDON_WINDUP_IMAGE="${{ inputs.tackle-addon-windup-image }}" export TACKLE_IMAGE_PULL_POLICY="${{ inputs.tackle-image-pull-policy }}" - export TACKLE_ANALYZER_CONTAINER_REQUESTS_MEMORY="${{ inputs.tackle-analyzer-container-memory }}" - export TACKLE_ANALYZER_CONTAINER_REQUESTS_CPU="${{ inputs.tackle-analyzer-container-cpu }}" + export TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY="${{ inputs.tackle-windup-container-memory }}" + export TACKLE_WINDUP_CONTAINER_REQUESTS_CPU="${{ inputs.tackle-windup-container-cpu }}" make install-tackle working-directory: ${{ github.action_path }}/../../.. shell: bash diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 2e322b6..dd29213 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -41,7 +41,7 @@ jobs: - konveyor/tackle2-hub - konveyor/tackle2-ui - konveyor/tackle2-addon - - konveyor/tackle2-addon-analyzer + - konveyor/tackle2-addon-windup - konveyor/operator - konveyor/tackle-pathfinder - konveyor/tackle-keycloak-theme @@ -63,7 +63,7 @@ jobs: - konveyor/tackle2-hub - konveyor/tackle2-ui - konveyor/tackle2-addon - - konveyor/tackle2-addon-analyzer + - konveyor/tackle2-addon-windup - konveyor/tackle2-operator - konveyor/tackle-pathfinder - konveyor/tackle-keycloak-init diff --git a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml index 0ff997d..d3cbdc2 100644 --- a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml +++ b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml @@ -4,6 +4,17 @@ metadata: annotations: alm-examples: |- [ + { + "apiVersion": "tackle.konveyor.io/v1alpha1", + "kind": "Addon", + "metadata": { + "name": "move2kube-plan", + "namespace": "konveyor-tackle" + }, + "spec": { + "image": "quay.io/konveyor/tackle-addon-move2kube-plan:latest" + } + }, { "apiVersion": "tackle.konveyor.io/v1alpha1", "kind": "Tackle", @@ -20,7 +31,7 @@ metadata: categories: Modernization & Migration certified: "false" containerImage: quay.io/konveyor/tackle2-operator:latest - createdAt: "2023-07-20T17:53:39Z" + createdAt: "2023-06-08T20:09:08Z" description: Konveyor is an open-source application modernization platform that helps organizations safely and predictably modernize applications to Kubernetes at scale. @@ -181,8 +192,8 @@ spec: 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 + - name: RELATED_IMAGE_ADDON_WINDUP + value: quay.io/konveyor/tackle2-addon-windup:latest image: quay.io/konveyor/tackle2-operator:latest imagePullPolicy: Always livenessProbe: @@ -371,6 +382,6 @@ spec: name: tackle-ui - image: quay.io/konveyor/tackle2-addon:latest name: addon-admin - - image: quay.io/konveyor/tackle2-addon-analyzer:latest - name: addon-analyzer + - image: quay.io/konveyor/tackle2-addon-windup:latest + name: addon-windup version: 99.0.0 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index b8eb2cd..62fd468 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -58,8 +58,8 @@ spec: 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 + - name: RELATED_IMAGE_ADDON_WINDUP + value: quay.io/konveyor/tackle2-addon-windup:latest name: tackle-operator image: controller:latest # this will be replaced with IMG by `make bundle` imagePullPolicy: Always diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index 9d36d9d..8ff42f5 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -1,4 +1,5 @@ ## Append samples you want in your CSV to this file as resources ## resources: - tackle_v1alpha1_tackle.yaml +- tackle_v1alpha1_addon.yaml #+kubebuilder:scaffold:manifestskustomizesamples diff --git a/config/samples/tackle_v1alpha1_addon.yaml b/config/samples/tackle_v1alpha1_addon.yaml new file mode 100644 index 0000000..a196d69 --- /dev/null +++ b/config/samples/tackle_v1alpha1_addon.yaml @@ -0,0 +1,7 @@ +apiVersion: tackle.konveyor.io/v1alpha1 +kind: Addon +metadata: + name: move2kube-plan + namespace: konveyor-tackle +spec: + image: 'quay.io/konveyor/tackle-addon-move2kube-plan:latest' diff --git a/hack/install-tackle.sh b/hack/install-tackle.sh index 7cbd91a..e1da817 100755 --- a/hack/install-tackle.sh +++ b/hack/install-tackle.sh @@ -9,10 +9,10 @@ TACKLE_PATHFINDER_IMAGE="${TACKLE_PATHFINDER_IMAGE:-quay.io/konveyor/tackle-path TACKLE_UI_IMAGE="${TACKLE_UI_IMAGE:-quay.io/konveyor/tackle2-ui:latest}" TACKLE_UI_INGRESS_CLASS_NAME="${TACKLE_UI_INGRESS_CLASS_NAME:-nginx}" TACKLE_ADDON_ADMIN_IMAGE="${TACKLE_ADDON_ADMIN_IMAGE:-quay.io/konveyor/tackle2-addon:latest}" -TACKLE_ADDON_ANALYZER_IMAGE="${TACKLE_ADDON_ANALYZER_IMAGE:-quay.io/konveyor/tackle2-addon-analyzer:latest}" +TACKLE_ADDON_WINDUP_IMAGE="${TACKLE_ADDON_WINDUP_IMAGE:-quay.io/konveyor/tackle2-addon-windup:latest}" TACKLE_IMAGE_PULL_POLICY="${TACKLE_IMAGE_PULL_POLICY:-Always}" -TACKLE_ANALYZER_CONTAINER_REQUESTS_MEMORY="${TACKLE_ANALYZER_CONTAINER_REQUESTS_MEMORY:-0}" -TACKLE_ANALYZER_CONTAINER_REQUESTS_CPU="${TACKLE_ANALYZER_CONTAINER_REQUESTS_CPU:-0}" +TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY="${TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY:-0}" +TACKLE_WINDUP_CONTAINER_REQUESTS_CPU="${TACKLE_WINDUP_CONTAINER_REQUESTS_CPU:-0}" TACKLE_FEATURE_AUTH_REQUIRED="${TACKLE_FEATURE_AUTH_REQUIRED:-false}" @@ -90,10 +90,10 @@ spec: ui_image_fqin: ${TACKLE_UI_IMAGE} ui_ingress_class_name: ${TACKLE_UI_INGRESS_CLASS_NAME} admin_fqin: ${TACKLE_ADDON_ADMIN_IMAGE} - analyzer_fqin: ${TACKLE_ADDON_ANALYZER_IMAGE} + windup_fqin: ${TACKLE_ADDON_WINDUP_IMAGE} image_pull_policy: ${TACKLE_IMAGE_PULL_POLICY} - analyzer_container_requests_memory: ${TACKLE_ANALYZER_CONTAINER_REQUESTS_MEMORY} - analyzer_container_requests_cpu: ${TACKLE_ANALYZER_CONTAINER_REQUESTS_CPU} + windup_container_requests_memory: ${TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY} + windup_container_requests_cpu: ${TACKLE_WINDUP_CONTAINER_REQUESTS_CPU} EOF # Wait for reconcile to finish kubectl wait \ diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml index 96c9f92..6899324 100644 --- a/roles/tackle/defaults/main.yml +++ b/roles/tackle/defaults/main.yml @@ -24,13 +24,13 @@ hub_deployment_name: "{{ hub_service_name }}" hub_deployment_replicas: "1" hub_deployment_strategy: "Recreate" hub_container_name: "{{ hub_service_name }}" -hub_container_limits_cpu: "1" -hub_container_limits_memory: "2Gi" -hub_container_requests_cpu: "500m" -hub_container_requests_memory: "1Gi" +hub_container_limits_cpu: "500m" +hub_container_limits_memory: "800Mi" +hub_container_requests_cpu: "100m" +hub_container_requests_memory: "350Mi" hub_database_filename: "hub.db" hub_database_volume_name: "{{ hub_service_name }}-database" -hub_database_volume_size: "10Gi" +hub_database_volume_size: "5Gi" hub_database_volume_path: "/database" hub_database_volume_claim_name: "{{ hub_service_name }}-database-volume-claim" hub_bucket_volume_name: "{{ hub_service_name }}-bucket" @@ -38,6 +38,8 @@ hub_bucket_volume_size: "100Gi" hub_bucket_volume_path: "/buckets" hub_bucket_volume_claim_name: "{{ hub_service_name }}-bucket-volume-claim" hub_bucket_volume_claim_mode: ReadWriteOnce +hub_seed_configmap_name: "{{ hub_service_name }}-seed" +hub_seed_configmap_path: "/seed" hub_addon_working_path: "/working" hub_task_sa: "{{ app_name }}-hub" hub_tls_enabled: false @@ -177,14 +179,14 @@ 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" -analyzer_service_name: "{{ app_name }}-{{ analyzer_name }}-{{ analyzer_component_name }}" -analyzer_container_limits_cpu: "1" -analyzer_container_limits_memory: "4Gi" -analyzer_container_requests_cpu: "1" -analyzer_container_requests_memory: "2Gi" +windup_fqin: "{{ lookup('env', 'RELATED_IMAGE_ADDON_WINDUP') }}" +windup_name: "windup" +windup_component_name: "addon" +windup_service_name: "{{ app_name }}-{{ windup_name }}-{{ windup_component_name }}" +windup_container_limits_cpu: "1" +windup_container_limits_memory: "6Gi" +windup_container_requests_cpu: "1" +windup_container_requests_memory: "4Gi" cache_name: "cache" cache_data_volume_size: "100Gi" diff --git a/roles/tackle/tasks/main.yml b/roles/tackle/tasks/main.yml index 75d40b1..38d015b 100644 --- a/roles/tackle/tasks/main.yml +++ b/roles/tackle/tasks/main.yml @@ -358,6 +358,11 @@ state: present definition: "{{ lookup('template', 'persistentvolumeclaim-hub-bucket.yml.j2') }}" +- name: "Setup Hub Seed ConfigMap" + k8s: + state: present + definition: "{{ lookup('template', 'configmap-hub-seed.yml.j2') }}" + - name: "Check if Hub Secret exists already so we don't update it" k8s_info: api_version: v1 @@ -467,7 +472,7 @@ - name: "Create Windup Addon CR" k8s: state: present - definition: "{{ lookup('template', 'customresource-addon-analyzer.yml.j2') }}" + definition: "{{ lookup('template', 'customresource-addon-windup.yml.j2') }}" - name: "Create Network Policy" k8s: @@ -515,4 +520,4 @@ definition: "{{ lookup('template', 'servicemonitor-hub.yml.j2') }}" when: - hub_metrics_enabled|bool - - openshift_cluster|bool + - openshift_cluster|bool \ No newline at end of file diff --git a/roles/tackle/templates/configmap-hub-seed.yml.j2 b/roles/tackle/templates/configmap-hub-seed.yml.j2 new file mode 100644 index 0000000..c5ea1cd --- /dev/null +++ b/roles/tackle/templates/configmap-hub-seed.yml.j2 @@ -0,0 +1,77 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + labels: + app.kubernetes.io/component: {{ hub_component_name }} + app.kubernetes.io/part-of: {{ app_name }} + name: {{ hub_seed_configmap_name }} + namespace: {{ app_namespace }} +data: + setting.json: | + [ + { "key": "git.insecure.enabled", "value": "false" }, + { "key": "svn.insecure.enabled", "value": "false" }, + { "key": "mvn.insecure.enabled", "value": "false" }, + { "key": "mvn.dependencies.update.forced", "value": "false" } + ] + jobfunction.json: | + [ + { "id": 1, "name": "Business Analyst" }, + { "id": 2, "name": "Business Service Owner / Manager" }, + { "id": 3, "name": "Consultant" }, + { "id": 4, "name": "DBA" }, + { "id": 5, "name": "Developer / Software Engineer" }, + { "id": 6, "name": "IT Operations" }, + { "id": 7, "name": "Program Manager" }, + { "id": 8, "name": "Project Manager" }, + { "id": 9, "name": "Service Owner" }, + { "id": 10, "name": "Solution Architect" }, + { "id": 11, "name": "System Administrator" }, + { "id": 12, "name": "Test Analyst / Manager" } + ] + tagtype.json: | + [ + { "id": 1, "name": "Application Type", "rank": 6, "color": "#ec7a08" }, + { "id": 2, "name": "Data Center", "rank": 5, "color": "#2b9af3" }, + { "id": 3, "name": "Database", "rank": 4, "color": "#6ec664" }, + { "id": 4, "name": "Language", "rank": 1, "color": "#009596" }, + { "id": 5, "name": "Operating System", "rank": 2, "color": "#a18fff" }, + { "id": 6, "name": "Runtime", "rank": 3, "color": "#7d1007" } + ] + tag.json: | + [ + { "id": 1, "name": "COTS", "tagtypeid": 1 }, + { "id": 2, "name": "In house", "tagtypeid": 1 }, + { "id": 3, "name": "SaaS", "tagtypeid": 1 }, + { "id": 4, "name": "Boston (USA)", "tagtypeid": 2 }, + { "id": 5, "name": "London (UK)", "tagtypeid": 2 }, + { "id": 6, "name": "Paris (FR)", "tagtypeid": 2 }, + { "id": 7, "name": "Sydney (AU)", "tagtypeid": 2 }, + { "id": 8, "name": "DB2", "tagtypeid": 3 }, + { "id": 9, "name": "MongoDB", "tagtypeid": 3 }, + { "id": 10, "name": "Oracle", "tagtypeid": 3 }, + { "id": 11, "name": "PostgreSQL", "tagtypeid": 3 }, + { "id": 12, "name": "SQL Server", "tagtypeid": 3 }, + { "id": 13, "name": "C# ASP .Net", "tagtypeid": 4 }, + { "id": 14, "name": "C++", "tagtypeid": 4 }, + { "id": 15, "name": "COBOL", "tagtypeid": 4 }, + { "id": 16, "name": "Java", "tagtypeid": 4 }, + { "id": 17, "name": "Javascript", "tagtypeid": 4 }, + { "id": 18, "name": "Python", "tagtypeid": 4 }, + { "id": 19, "name": "RHEL 8", "tagtypeid": 5 }, + { "id": 20, "name": "Windows Server 2016", "tagtypeid": 5 }, + { "id": 21, "name": "Z/OS", "tagtypeid": 5 }, + { "id": 22, "name": "EAP", "tagtypeid": 6 }, + { "id": 23, "name": "JWS", "tagtypeid": 6 }, + { "id": 24, "name": "Quarkus", "tagtypeid": 6 }, + { "id": 25, "name": "Spring Boot", "tagtypeid": 6 }, + { "id": 26, "name": "Tomcat", "tagtypeid": 6 }, + { "id": 27, "name": "WebLogic", "tagtypeid": 6 }, + { "id": 28, "name": "WebSphere", "tagtypeid": 6 } + ] + proxy.json: | + [ + {"kind": "http", "host": "", "port": 0}, + {"kind": "https", "host": "", "port": 0} + ] diff --git a/roles/tackle/templates/customresource-addon-analyzer.yml.j2 b/roles/tackle/templates/customresource-addon-analyzer.yml.j2 deleted file mode 100644 index 2cf9d55..0000000 --- a/roles/tackle/templates/customresource-addon-analyzer.yml.j2 +++ /dev/null @@ -1,20 +0,0 @@ ---- -kind: Addon -apiVersion: tackle.konveyor.io/v1alpha1 -metadata: - name: {{ analyzer_name }} - namespace: {{ app_namespace }} - labels: - app.kubernetes.io/name: {{ analyzer_service_name }} - app.kubernetes.io/component: {{ analyzer_component_name }} - app.kubernetes.io/part-of: {{ app_name }} -spec: - image: {{ analyzer_fqin }} - imagePullPolicy: {{ image_pull_policy }} - resources: - limits: - cpu: {{ analyzer_container_limits_cpu }} - memory: {{ analyzer_container_limits_memory }} - requests: - cpu: {{ analyzer_container_requests_cpu }} - memory: {{ analyzer_container_requests_memory }} diff --git a/roles/tackle/templates/customresource-addon-windup.yml.j2 b/roles/tackle/templates/customresource-addon-windup.yml.j2 new file mode 100644 index 0000000..75c0869 --- /dev/null +++ b/roles/tackle/templates/customresource-addon-windup.yml.j2 @@ -0,0 +1,20 @@ +--- +kind: Addon +apiVersion: tackle.konveyor.io/v1alpha1 +metadata: + name: {{ windup_name }} + namespace: {{ app_namespace }} + labels: + app.kubernetes.io/name: {{ windup_service_name }} + app.kubernetes.io/component: {{ windup_component_name }} + app.kubernetes.io/part-of: {{ app_name }} +spec: + image: {{ windup_fqin }} + imagePullPolicy: {{ image_pull_policy }} + resources: + limits: + cpu: {{ windup_container_limits_cpu }} + memory: {{ windup_container_limits_memory }} + requests: + cpu: {{ windup_container_requests_cpu }} + memory: {{ windup_container_requests_memory }} diff --git a/roles/tackle/templates/deployment-hub.yml.j2 b/roles/tackle/templates/deployment-hub.yml.j2 index 69d4960..1806a7c 100644 --- a/roles/tackle/templates/deployment-hub.yml.j2 +++ b/roles/tackle/templates/deployment-hub.yml.j2 @@ -81,6 +81,8 @@ spec: value: "{{ hub_addon_working_path }}" - name: DB_PATH value: "{{ hub_database_volume_path }}/{{ hub_database_filename }}" + - name: DB_SEED_PATH + value: "{{ hub_seed_configmap_path }}" - name: BUCKET_PATH value: "{{ hub_bucket_volume_path }}" - name: BUCKET_PVC diff --git a/tools/templates/clusterserviceversion.yaml.j2 b/tools/templates/clusterserviceversion.yaml.j2 index 654f547..a40506f 100644 --- a/tools/templates/clusterserviceversion.yaml.j2 +++ b/tools/templates/clusterserviceversion.yaml.j2 @@ -156,8 +156,8 @@ spec: value: quay.io/konveyor/tackle2-ui:{{ tag }} - name: RELATED_IMAGE_ADDON_ADMIN value: quay.io/konveyor/tackle2-addon:{{ tag }} - - name: RELATED_IMAGE_ADDON_ANALYZER - value: quay.io/konveyor/tackle2-addon-analyzer:{{ tag }} + - name: RELATED_IMAGE_ADDON_WINDUP + value: quay.io/konveyor/tackle2-addon-windup:{{ tag }} name: tackle-operator image: quay.io/konveyor/tackle2-operator:{{ tag }} imagePullPolicy: Always @@ -353,8 +353,8 @@ spec: image: quay.io/konveyor/tackle2-ui:{{ tag }} - name: addon-admin image: quay.io/konveyor/tackle2-addon:{{ tag }} - - name: addon-analyzer - image: quay.io/konveyor/tackle2-addon-analyzer:{{ tag }} + - name: addon-windup + image: quay.io/konveyor/tackle2-addon-windup:{{ tag }} - name: pathfinder image: quay.io/konveyor/tackle-pathfinder:1.3.1-native - name: keycloak-sso