Drop standalone UI and must gather api (backport)

.bazelrc

@@ -13,8 +13,6 @@ build --action_env=OPM_OPTS
 build --action_env=CONTROLLER_IMAGE=quay.io/kubev2v/forklift-controller:latest
 build --action_env=API_IMAGE=quay.io/kubev2v/forklift-api:latest
 build --action_env=MUST_GATHER_IMAGE=quay.io/kubev2v/forklift-must-gather:latest
-build --action_env=MUST_GATHER_API_IMAGE=quay.io/kubev2v/forklift-must-gather-api:latest
-build --action_env=UI_IMAGE=quay.io/kubev2v/forklift-ui:latest
 build --action_env=UI_PLUGIN_IMAGE=quay.io/kubev2v/forklift-console-plugin:latest
 build --action_env=VALIDATION_IMAGE=quay.io/kubev2v/forklift-validation:latest
 build --action_env=VIRT_V2V_IMAGE=quay.io/kubev2v/forklift-virt-v2v:latest

Makefile

@@ -60,8 +60,6 @@ OVA_PROVIDER_SERVER_IMAGE ?= $(REGISTRY)/$(REGISTRY_ORG)/forklift-ova-provider-s
 
 ### External images
 MUST_GATHER_IMAGE ?= quay.io/kubev2v/forklift-must-gather:latest
-MUST_GATHER_API_IMAGE ?= quay.io/kubev2v/forklift-must-gather-api:latest
-UI_IMAGE ?= quay.io/kubev2v/forklift-ui:latest
 UI_PLUGIN_IMAGE ?= quay.io/kubev2v/forklift-console-plugin:latest
 
 BAZEL_OPTS ?= --verbose_failures
@@ -226,8 +224,6 @@ build-operator-bundle-image: check_container_runtime
 		--action_env DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) \
 		--action_env OPERATOR_IMAGE=$(OPERATOR_IMAGE) \
 		--action_env MUST_GATHER_IMAGE=$(MUST_GATHER_IMAGE) \
-		--action_env MUST_GATHER_API_IMAGE=$(MUST_GATHER_API_IMAGE) \
-		--action_env UI_IMAGE=$(UI_IMAGE) \
 		--action_env UI_PLUGIN_IMAGE=$(UI_PLUGIN_IMAGE) \
 		--action_env VALIDATION_IMAGE=$(VALIDATION_IMAGE) \
 		--action_env VIRT_V2V_IMAGE=$(VIRT_V2V_IMAGE) \

README.md

@@ -44,8 +44,6 @@ Another option to override the default values can use `--action_env` as in the e
 | OPERATOR_IMAGE             | quay.io/kubev2v/forklift-operator:latest        | The forklift operator image with the ansible-operator role. |
 | CONTROLLER_IMAGE           | quay.io/kubev2v/forklift-controller:latest      | The forklift controller image.                              |
 | MUST_GATHER_IMAGE          | quay.io/kubev2v/forklift-must-gather:latest     | The forklift must gather an image.                          |
-| MUST_GATHER_API_IMAGE      | quay.io/kubev2v/forklift-must-gather-api:latest | The forklift must gather image api.                         |
-| UI_IMAGE                   | quay.io/kubev2v/forklift-ui:latest              | The forklift UI image.                                      |
 | UI_PLUGIN_IMAGE            | quay.io/kubev2v/forklift-console-plugin:latest  | The forklift OKD/OpenShift UI plugin image.                 |
 | VALIDATION_IMAGE           | quay.io/kubev2v/forklift-validation:latest      | The forklift validation image.                              |
 | VIRT_V2V_IMAGE             | quay.io/kubev2v/forklift-virt-v2v:latest        | The forklift virt v2v image for cold migration.             |

hack/installation/env.sh

@@ -45,7 +45,6 @@
 ### External images
 # export MUST_GATHER_IMAGE="quay.io/kubev2v/forklift-must-gather:latest"
 # export MUST_GATHER_API_IMAGE="quay.io/kubev2v/forklift-must-gather-api:latest"
-# export UI_IMAGE="quay.io/kubev2v/forklift-ui:latest"
 # export UI_PLUGIN_IMAGE="quay.io/kubev2v/forklift-console-plugin:latest"
 ###################################################################
 

hack/release-images.sh

@@ -10,8 +10,6 @@ fi
 CONTROLLER_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-controller:${REGISTRY_TAG}
 OPERATOR_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-operator:${REGISTRY_TAG}
 MUST_GATHER_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-must-gather:${REGISTRY_TAG}
-MUST_GATHER_API_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-must-gather-api:${REGISTRY_TAG}
-UI_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-ui:${REGISTRY_TAG}
 UI_PLUGIN_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-console-plugin:${REGISTRY_TAG}
 VALIDATION_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-validation:${REGISTRY_TAG}
 VIRT_V2V_IMAGE=${REGISTRY}/${REGISTRY_ORG}/forklift-virt-v2v:${REGISTRY_TAG}
@@ -33,8 +31,6 @@ bazel run push-forklift-operator
 bazel run push-forklift-operator-bundle \
     --action_env OPERATOR_IMAGE=${OPERATOR_IMAGE} \
     --action_env MUST_GATHER_IMAGE=${MUST_GATHER_IMAGE} \
-    --action_env MUST_GATHER_API_IMAGE=${MUST_GATHER_API_IMAGE} \
-    --action_env UI_IMAGE=${UI_IMAGE} \
     --action_env UI_PLUGIN_IMAGE=${UI_PLUGIN_IMAGE} \
     --action_env VALIDATION_IMAGE=${VALIDATION_IMAGE} \
     --action_env VIRT_V2V_IMAGE=${VIRT_V2V_IMAGE} \

operator/config/manager/manager.yaml

@@ -44,10 +44,6 @@ spec:
           value: ${API_IMAGE}
         - name: MUST_GATHER_IMAGE
           value: ${MUST_GATHER_IMAGE}
-        - name: MUST_GATHER_API_IMAGE
-          value: ${MUST_GATHER_API_IMAGE}
-        - name: UI_IMAGE
-          value: ${UI_IMAGE}
         - name: UI_PLUGIN_IMAGE
           value: ${UI_PLUGIN_IMAGE}
         - name: VALIDATION_IMAGE

operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml

@@ -20,7 +20,6 @@ metadata:
         "spec": {
           "feature_ui_plugin": "true",
           "feature_validation": "true",
-          "feature_must_gather_api": "true",
           "feature_volume_populator": "true"
         }
       }
@@ -101,14 +100,8 @@ spec:
     * Controller, to coordinate migration processes.
     * UI, the web console to manage migrations.
     * Validation, a service to validate migration workflows.
-    * Must-gather-api, a service to generate targeted must-gather archives.
 
     ### Compatibility
-    Forklift 2.2 is supported on OpenShift 4.9
-
-    Forklift 2.3 is supported on OpenShift 4.10 and 4.11
-
-    Forklift 2.4 is supported on OpenShift 4.11 and 4.12
 
     Forklift 2.5 is supported on OpenShift 4.12 to 4.15
 

operator/config/samples/forklift_v1beta1_forkliftcontroller.yaml

@@ -7,5 +7,4 @@ metadata:
 spec:
   feature_ui_plugin: 'true'
   feature_validation: 'true'
-  feature_must_gather_api: 'true'
   feature_volume_populator: 'true'

operator/roles/forkliftcontroller/defaults/main.yml

@@ -5,7 +5,6 @@ app_namespace: "{{ lookup( 'env', 'WATCH_NAMESPACE') or 'konveyor-forklift' }}"
 # Feature defaults
 feature_ui_plugin: true
 feature_validation: true
-feature_must_gather_api: true
 feature_volume_populator: true
 
 k8s_cluster: false
@@ -107,22 +106,6 @@ populator_controller_deployment_name: "{{ app_name }}-volume-populator-controlle
 populator_controller_container_name: "{{ app_name }}-populator-controller"
 populator_openstack_image_fqin: "{{ lookup( 'env', 'OPENSTACK_POPULATOR_IMAGE') or lookup( 'env', 'RELATED_IMAGE_OPENSTACK_POPULATOR') }}"
 
-must_gather_api_image_fqin: "{{ lookup( 'env', 'MUST_GATHER_API_IMAGE') or lookup( 'env', 'RELATED_IMAGE_MUST_GATHER_API') }}"
-must_gather_api_service_name: "{{ app_name }}-must-gather-api"
-must_gather_api_deployment_name: "{{ must_gather_api_service_name }}"
-must_gather_api_container_name: "{{ app_name }}-must-gather-api"
-must_gather_api_container_limits_cpu: "1000m"
-must_gather_api_container_limits_memory: "1Gi"
-must_gather_api_container_requests_cpu: "100m"
-must_gather_api_container_requests_memory: "150Mi"
-must_gather_api_tls_secret_name: "{{ must_gather_api_service_name }}-serving-cert"
-must_gather_api_issuer_name: "{{ must_gather_api_service_name  }}-issuer"
-must_gather_api_certificate_name: "{{ must_gather_api_service_name }}-certificate"
-must_gather_api_db_path: "/tmp/gatherings.db"
-must_gather_api_cleanup_max_age: "-1"
-must_gather_api_debug: false
-must_gather_api_state: absent
-
 must_gather_image_fqin: "{{ lookup( 'env', 'MUST_GATHER_IMAGE') or lookup( 'env', 'RELATED_IMAGE_MUST_GATHER') }}"
 virt_v2v_image_fqin: "{{ lookup( 'env', 'VIRT_V2V_IMAGE') or lookup( 'env', 'RELATED_IMAGE_VIRT_V2V') }}"
 virt_v2v_warm_image_fqin: "{{ lookup( 'env', 'VIRT_V2V_WARM_IMAGE') or lookup( 'env', 'RELATED_IMAGE_VIRT_V2V_WARM') }}"

operator/roles/forkliftcontroller/tasks/main.yml

@@ -11,11 +11,6 @@
       validation_state: "present"
     when: feature_validation|bool
 
-  - name: "Set must-gather-api feature state"
-    set_fact:
-      must_gather_api_state: "present"
-    when: feature_must_gather_api|bool
-
   - name: "Set volume populator feature state"
     set_fact:
       volume_populator_state: "present"
@@ -130,10 +125,6 @@
       k8s:
         state: present
         definition: "{{ lookup('template', 'controller/ca.yml.j2') }}"
-    - name: "Configure must-gather certificate on K8s"
-      k8s:
-        state: present
-        definition: "{{ lookup('template', 'must-gather-api/ca.yml.j2') }}"
 
   - name: "Setup api service"
     k8s:
@@ -209,18 +200,6 @@
         state: "{{ validation_state }}"
         definition: "{{ lookup('template', 'validation/deployment-validation.yml.j2') }}"
 
-  - when: feature_must_gather_api|bool
-    block:
-    - name: "Setup must-gather-api service"
-      k8s:
-        state: "{{ must_gather_api_state }}"
-        definition: "{{ lookup('template', 'must-gather-api/service-must-gather-api.yml.j2') }}"
-
-    - name: "Setup must-gather-api deployment"
-      k8s:
-        state: "{{ must_gather_api_state }}"
-        definition: "{{ lookup('template', 'must-gather-api/deployment-must-gather-api.yml.j2') }}"
-
   - when: feature_ui_plugin|bool and not k8s_cluster|bool
     block:
 
@@ -283,12 +262,3 @@
       loop_var: resource_kind
     vars:
       feature_label: "{{ validation_service_name }}"
-
-  - when: not feature_must_gather_api|bool
-    name: "Cleanup {{ must_gather_api_service_name }} if disabled"
-    include_tasks: cleanup.yml
-    loop: "{{ forklift_resources }}"
-    loop_control:
-      loop_var: resource_kind
-    vars:
-      feature_label: "{{ must_gather_api_service_name }}"

operator/roles/forkliftcontroller/templates/ui-plugin/console-plugin.yml.j2

@@ -27,10 +27,3 @@ spec:
         name: {{ services_service_name }}
         namespace: {{ app_namespace }}
         port: 8443
-    - type: Service
-      alias: {{ must_gather_api_service_name }}
-      authorize: true
-      service:
-        name: {{ must_gather_api_service_name }}
-        namespace: {{ app_namespace }}
-        port: 8443