diff --git a/.bazelrc b/.bazelrc index 288a6140c..d367c0542 100644 --- a/.bazelrc +++ b/.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 diff --git a/Makefile b/Makefile index 54a3a018a..142dae4f9 100644 --- a/Makefile +++ b/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) \ diff --git a/README.md b/README.md index 64d22d6b2..d27a69fa2 100644 --- a/README.md +++ b/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. | diff --git a/hack/installation/env.sh b/hack/installation/env.sh index ad9cc17f2..e727df485 100644 --- a/hack/installation/env.sh +++ b/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" ################################################################### diff --git a/hack/release-images.sh b/hack/release-images.sh index 1d03aef59..7d7090ceb 100755 --- a/hack/release-images.sh +++ b/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} \ diff --git a/operator/config/manager/manager.yaml b/operator/config/manager/manager.yaml index e6802e2cd..6483cab33 100644 --- a/operator/config/manager/manager.yaml +++ b/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 diff --git a/operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml b/operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml index 350724f87..a5cbc37c0 100644 --- a/operator/config/manifests/bases/forklift-operator.clusterserviceversion.yaml +++ b/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 diff --git a/operator/config/samples/forklift_v1beta1_forkliftcontroller.yaml b/operator/config/samples/forklift_v1beta1_forkliftcontroller.yaml index d29954ffa..222fec928 100644 --- a/operator/config/samples/forklift_v1beta1_forkliftcontroller.yaml +++ b/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' diff --git a/operator/roles/forkliftcontroller/defaults/main.yml b/operator/roles/forkliftcontroller/defaults/main.yml index 10397f1d0..3faa69de6 100644 --- a/operator/roles/forkliftcontroller/defaults/main.yml +++ b/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') }}" diff --git a/operator/roles/forkliftcontroller/tasks/main.yml b/operator/roles/forkliftcontroller/tasks/main.yml index f76c272eb..2492b5039 100644 --- a/operator/roles/forkliftcontroller/tasks/main.yml +++ b/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 }}" diff --git a/operator/roles/forkliftcontroller/templates/must-gather-api/ca.yml.j2 b/operator/roles/forkliftcontroller/templates/must-gather-api/ca.yml.j2 deleted file mode 100644 index 4b1472415..000000000 --- a/operator/roles/forkliftcontroller/templates/must-gather-api/ca.yml.j2 +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ must_gather_api_certificate_name }} - namespace: {{ app_namespace }} -spec: - isCA: true - dnsNames: - - {{ must_gather_api_service_name }}.{{ app_namespace }}.svc - - {{ must_gather_api_service_name }}.{{ app_namespace }}.svc.cluster.local - commonName: {{ must_gather_api_certificate_name }} - secretName: {{ must_gather_api_tls_secret_name }} - privateKey: - algorithm: ECDSA - size: 256 - issuerRef: - name: {{ app_name }}-issuer - kind: Issuer - group: cert-manager.io diff --git a/operator/roles/forkliftcontroller/templates/must-gather-api/deployment-must-gather-api.yml.j2 b/operator/roles/forkliftcontroller/templates/must-gather-api/deployment-must-gather-api.yml.j2 deleted file mode 100644 index 5f1c16406..000000000 --- a/operator/roles/forkliftcontroller/templates/must-gather-api/deployment-must-gather-api.yml.j2 +++ /dev/null @@ -1,66 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ must_gather_api_deployment_name }} - namespace: {{ app_namespace }} - labels: - app: {{ app_name }} - service: {{ must_gather_api_service_name }} -spec: - replicas: 1 - selector: - matchLabels: - app: {{ app_name }} - service: {{ must_gather_api_service_name }} - template: - metadata: - labels: - app: {{ app_name }} - service: {{ must_gather_api_service_name }} - spec: - containers: - - name: {{ must_gather_api_container_name }} - image: {{ must_gather_api_image_fqin }} - imagePullPolicy: {{ image_pull_policy }} - ports: - - name: api - containerPort: 8443 - protocol: TCP - env: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: PORT - value: "8443" - - name: API_TLS_CERTIFICATE - value: "/var/run/secrets/{{ must_gather_api_tls_secret_name }}/tls.crt" - - name: API_TLS_KEY - value: "/var/run/secrets/{{ must_gather_api_tls_secret_name }}/tls.key" - - name: DB_PATH - value: "{{ must_gather_api_db_path }}" - - name: CLEANUP_MAX_AGE - value: "{{ must_gather_api_cleanup_max_age }}" - - name: MUST_GATHER_IMAGE - value: "{{ must_gather_image_fqin }}" -{% if must_gather_api_debug|bool %} - - name: DEBUG - value: "true" -{% endif %} - resources: - limits: - cpu: {{ must_gather_api_container_limits_cpu }} - memory: {{ must_gather_api_container_limits_memory }} - requests: - cpu: {{ must_gather_api_container_requests_cpu }} - memory: {{ must_gather_api_container_requests_memory }} - volumeMounts: - - name: {{ must_gather_api_tls_secret_name }} - mountPath: /var/run/secrets/{{ must_gather_api_tls_secret_name }} - volumes: - - name: {{ must_gather_api_tls_secret_name }} - secret: - secretName: {{ must_gather_api_tls_secret_name }} - defaultMode: 420 diff --git a/operator/roles/forkliftcontroller/templates/must-gather-api/service-must-gather-api.yml.j2 b/operator/roles/forkliftcontroller/templates/must-gather-api/service-must-gather-api.yml.j2 deleted file mode 100644 index ad87bcf9c..000000000 --- a/operator/roles/forkliftcontroller/templates/must-gather-api/service-must-gather-api.yml.j2 +++ /dev/null @@ -1,23 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: -{% if not k8s_cluster|bool %} - annotations: - service.beta.openshift.io/serving-cert-secret-name: {{ must_gather_api_tls_secret_name }} -{% endif %} - name: {{ must_gather_api_service_name }} - namespace: "{{ app_namespace }}" - labels: - app: {{ app_name }} - service: {{ must_gather_api_service_name }} -spec: - type: ClusterIP - selector: - app: {{ app_name }} - service: {{ must_gather_api_service_name }} - ports: - - name: api-https - port: 8443 - targetPort: 8443 - protocol: TCP diff --git a/operator/roles/forkliftcontroller/templates/ui-plugin/console-plugin.yml.j2 b/operator/roles/forkliftcontroller/templates/ui-plugin/console-plugin.yml.j2 index 17c97f2f5..2cb773d5e 100644 --- a/operator/roles/forkliftcontroller/templates/ui-plugin/console-plugin.yml.j2 +++ b/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