Skip to content

Commit

Permalink
Drop standalone UI
Browse files Browse the repository at this point in the history
Signed-off-by: Arik Hadas <ahadas@redhat.com>
  • Loading branch information
ahadas committed Jun 28, 2023
1 parent 7ce89eb commit d89c36b
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 319 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ metadata:
"namespace": "konveyor-forklift"
},
"spec": {
"feature_ui": "false",
"feature_ui_plugin": "true",
"feature_validation": "true",
"feature_must_gather_api": "true",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
name: forklift-controller
namespace: ${NAMESPACE}
spec:
feature_ui: 'false'
feature_ui_plugin: 'true'
feature_validation: 'true'
feature_must_gather_api: 'true'
Expand Down
1 change: 0 additions & 1 deletion operator/docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ metadata:
name: forklift-controller
namespace: konveyor-forklift
spec:
feature_ui: true
feature_validation: true
EOF
```
Expand Down
23 changes: 2 additions & 21 deletions operator/docs/k8s.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,14 @@ konveyor-forklift-bx8pt 1/1 Running 0

If this looks Ok, then you can proceed to create the forkliftcontroller CR that will install the rest of Forklift components.

### Creating a _ForkliftController_ CR (SSL/TLS disabled)
### Creating a _ForkliftController_ CR
```
$ cat << EOF | kubectl -n konveyor-forklift apply -f -
apiVersion: forklift.konveyor.io/v1beta1
kind: ForkliftController
metadata:
name: forklift-controller
namespace: konveyor-forklift
spec:
feature_ui: false
feature_validation: true
ui_tls_enabled: false
EOF
```

### Creating a _ForkliftController_ CR (SSL/TLS disabled) with UI
```
$ cat << EOF | kubectl -n konveyor-forklift apply -f -
apiVersion: forklift.konveyor.io/v1beta1
kind: ForkliftController
metadata:
name: forklift-controller
namespace: konveyor-forklift
spec:
feature_ui: true
feature_auth_required: false
feature_validation: true
ui_tls_enabled: false
spec: {}
EOF
```
21 changes: 1 addition & 20 deletions operator/roles/forkliftcontroller/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ app_name: "{{ lookup('env', 'APP_NAME') or 'forklift' }}"
app_namespace: "{{ lookup( 'env', 'WATCH_NAMESPACE') or 'konveyor-forklift' }}"

# Feature defaults
feature_ui: false
feature_ui_plugin: true
feature_validation: true
feature_must_gather_api: true
Expand Down Expand Up @@ -66,25 +65,6 @@ validation_issuer_name: "{{ validation_service_name }}-issuer"
validation_certificate_name: "{{ validation_service_name }}-certificate"
validation_state: absent

ui_image_fqin: "{{ lookup( 'env', 'UI_IMAGE') or lookup( 'env', 'RELATED_IMAGE_UI') }}"
ui_oauth_user_scope: "user:full"
ui_configmap_path: "/etc/forklift-ui"
ui_configmap_name: "{{ ui_service_name }}-config"
ui_service_name: "{{ app_name }}-ui"
ui_deployment_name: "{{ ui_service_name }}"
ui_container_name: "{{ app_name }}-ui"
ui_container_limits_cpu: "100m"
ui_container_limits_memory: "800Mi"
ui_container_requests_cpu: "100m"
ui_container_requests_memory: "150Mi"
ui_tls_secret_name: "{{ ui_service_name }}-serving-cert"
ui_tls_enabled: true
ui_route_name: "virt"
ui_meta_file_name: "meta.json"
ui_node_extra_ca_certs: "/opt/app-root/src/ca.crt"
ui_state: absent
ui_plugin_state: absent

ui_plugin_image_fqin: "{{ lookup( 'env', 'UI_PLUGIN_IMAGE') or lookup( 'env', 'RELATED_IMAGE_UI_PLUGIN') }}"
ui_plugin_console_name: "{{ app_name }}-console-plugin"
ui_plugin_display_name: "Console plugin for {{ app_name }}"
Expand All @@ -95,6 +75,7 @@ ui_plugin_container_limits_cpu: "100m"
ui_plugin_container_limits_memory: "800Mi"
ui_plugin_container_requests_cpu: "100m"
ui_plugin_container_requests_memory: "150Mi"
ui_plugin_state: absent

api_image_fqin: "{{ lookup( 'env', 'API_IMAGE') or lookup( 'env', 'RELATED_IMAGE_API') }}"
api_service_name: "{{ app_name }}-api"
Expand Down
93 changes: 0 additions & 93 deletions operator/roles/forkliftcontroller/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
---
- block:

- name: "Set UI feature state"
set_fact:
ui_state: "present"
when: feature_ui|bool

- name: "Set UI plugin feature state"
set_fact:
ui_plugin_state: "present"
Expand Down Expand Up @@ -169,85 +164,6 @@
state: "{{ must_gather_api_state }}"
definition: "{{ lookup('template', 'must-gather-api/deployment-must-gather-api.yml.j2') }}"

# Non-k8s UI tasks
- when: feature_ui|bool and not k8s_cluster|bool
block:

- name: "Setup UI route"
k8s:
state: "{{ ui_state }}"
definition: "{{ lookup('template', 'ui/route-ui.yml.j2') }}"

- name: "Obtain UI route"
k8s_info:
api_version: "route.openshift.io/v1"
kind: "Route"
namespace: "{{ app_namespace }}"
name: "{{ ui_route_name }}"
register: route
until: (route.resources|length) > 0
delay: 10
retries: 6

- name: "Extract UI FQDN from the route"
set_fact:
ui_route_fqdn: "{{ route.resources[0].spec.host }}"

- name: "Obtain OCP cluster version"
k8s_info:
kind: ClusterVersion
name: version
register: ocp_cv

- name: "Extract OCP cluster version"
set_fact:
forklift_cluster_version: "{{ ocp_cv | json_query(query) | first }}"
vars:
query: "resources[0].status.history[?state=='Completed'].version"
when: (ocp_cv.resources|length) > 0

- name: "Check if UI oauthclient exists already so we don't update it"
k8s_info:
api_version: v1
kind: OAuthClient
name: "{{ ui_service_name }}"
namespace: "{{ app_namespace }}"
register: ui_oauthclient_status

- when: (ui_oauthclient_status.resources | length) == 0
block:
- name: "Generate random secret value for oauth client"
set_fact:
ui_oauth_secret: "{{ 99999999 | random | to_uuid | b64encode }}"

- name: "Setup UI oauthclient"
k8s:
state: present
definition: "{{ lookup('template', 'ui/oauthclient-ui.yml.j2') }}"

- name: "Use existing secret value for oauth client"
set_fact:
ui_oauth_secret: "{{ ui_oauthclient_status.resources[0].secret }}"
when: (ui_oauthclient_status.resources | length) > 0

- when: feature_ui|bool
block:

- name: "Setup UI config map"
k8s:
state: "{{ ui_state }}"
definition: "{{ lookup('template', 'ui/configmap-ui.yml.j2') }}"

- name: "Setup UI service"
k8s:
state: "{{ ui_state }}"
definition: "{{ lookup('template', 'ui/service-ui.yml.j2') }}"

- name: "Setup UI deployment"
k8s:
state: "{{ ui_state }}"
definition: "{{ lookup('template', 'ui/deployment-ui.yml.j2') }}"

- when: feature_ui_plugin|bool and not k8s_cluster|bool
block:

Expand Down Expand Up @@ -302,15 +218,6 @@
vars:
feature_label: "{{ ui_plugin_service_name }}"

- when: not feature_ui|bool
name: "Cleanup {{ ui_service_name }} if disabled"
include_tasks: cleanup.yml
loop: "{{ forklift_resources }}"
loop_control:
loop_var: resource_kind
vars:
feature_label: "{{ ui_service_name }}"

- when: not feature_validation|bool
name: "Cleanup {{ validation_service_name }} if disabled"
include_tasks: cleanup.yml
Expand Down
30 changes: 0 additions & 30 deletions operator/roles/forkliftcontroller/templates/ui/configmap-ui.yml.j2

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions operator/roles/forkliftcontroller/templates/ui/route-ui.yml.j2

This file was deleted.

Loading

0 comments on commit d89c36b

Please sign in to comment.