From 9e98f90f4c7dbd5c14540f2db081ea76f17f9071 Mon Sep 17 00:00:00 2001 From: Derek Whatley Date: Wed, 19 May 2021 19:19:21 -0400 Subject: [PATCH 1/4] Add switch to enable controller cached client --- roles/migrationcontroller/defaults/main.yml | 1 + roles/migrationcontroller/templates/controller.yml.j2 | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/roles/migrationcontroller/defaults/main.yml b/roles/migrationcontroller/defaults/main.yml index b8c39e2b..56bd7de6 100644 --- a/roles/migrationcontroller/defaults/main.yml +++ b/roles/migrationcontroller/defaults/main.yml @@ -59,6 +59,7 @@ mig_controller_requests_cpu: "100m" mig_controller_requests_memory: "350Mi" mig_controller_version: "{{ snapshot_tag | default(lookup( 'env', 'MIG_CONTROLLER_TAG')) }}" mig_controller_image_fqin: "{{ mig_controller_image }}:{{ mig_controller_version }}" +mig_controller_enable_cache: true discovery_volume_path: "/var/cache/discovery" mig_operator_version: "latest" mig_pv_move_storageclasses: [] diff --git a/roles/migrationcontroller/templates/controller.yml.j2 b/roles/migrationcontroller/templates/controller.yml.j2 index 3f7b2642..d5bd426b 100644 --- a/roles/migrationcontroller/templates/controller.yml.j2 +++ b/roles/migrationcontroller/templates/controller.yml.j2 @@ -71,6 +71,10 @@ spec: value: webhook-server-secret - name: MIGRATION_REGISTRY_IMAGE value: {{ migration_registry_image_fqin }} +{% if mig_controller_enable_cache|bool is true %} + - name: ENABLE_CACHE + value: "true" +{% endif %} {% if http_proxy|length >0 %} - name: HTTP_PROXY value: {{ http_proxy }} From a879d0c2e4d2762ec35ce3951976186922b6038f Mon Sep 17 00:00:00 2001 From: Derek Whatley Date: Wed, 19 May 2021 19:20:28 -0400 Subject: [PATCH 2/4] Change default behavior to not use cache --- roles/migrationcontroller/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/migrationcontroller/defaults/main.yml b/roles/migrationcontroller/defaults/main.yml index 56bd7de6..2606126d 100644 --- a/roles/migrationcontroller/defaults/main.yml +++ b/roles/migrationcontroller/defaults/main.yml @@ -59,7 +59,7 @@ mig_controller_requests_cpu: "100m" mig_controller_requests_memory: "350Mi" mig_controller_version: "{{ snapshot_tag | default(lookup( 'env', 'MIG_CONTROLLER_TAG')) }}" mig_controller_image_fqin: "{{ mig_controller_image }}:{{ mig_controller_version }}" -mig_controller_enable_cache: true +mig_controller_enable_cache: false discovery_volume_path: "/var/cache/discovery" mig_operator_version: "latest" mig_pv_move_storageclasses: [] From 8e8b92ef55a68fdd3221c79cc48eb8da345c1a25 Mon Sep 17 00:00:00 2001 From: Derek Whatley Date: Thu, 20 May 2021 14:38:44 -0400 Subject: [PATCH 3/4] Update controller.yml.j2 --- roles/migrationcontroller/templates/controller.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/migrationcontroller/templates/controller.yml.j2 b/roles/migrationcontroller/templates/controller.yml.j2 index d5bd426b..1a78eaf2 100644 --- a/roles/migrationcontroller/templates/controller.yml.j2 +++ b/roles/migrationcontroller/templates/controller.yml.j2 @@ -72,7 +72,7 @@ spec: - name: MIGRATION_REGISTRY_IMAGE value: {{ migration_registry_image_fqin }} {% if mig_controller_enable_cache|bool is true %} - - name: ENABLE_CACHE + - name: ENABLE_CACHED_CLIENT value: "true" {% endif %} {% if http_proxy|length >0 %} From bba29f0908083a1d3441b43d678c10a37bd0a7f4 Mon Sep 17 00:00:00 2001 From: Derek Whatley Date: Tue, 25 May 2021 18:09:08 -0400 Subject: [PATCH 4/4] Move mig_controller_enable_cache to be set in configmap --- roles/migrationcontroller/templates/controller.yml.j2 | 4 ---- roles/migrationcontroller/templates/controller_config.yml.j2 | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/migrationcontroller/templates/controller.yml.j2 b/roles/migrationcontroller/templates/controller.yml.j2 index 1a78eaf2..3f7b2642 100644 --- a/roles/migrationcontroller/templates/controller.yml.j2 +++ b/roles/migrationcontroller/templates/controller.yml.j2 @@ -71,10 +71,6 @@ spec: value: webhook-server-secret - name: MIGRATION_REGISTRY_IMAGE value: {{ migration_registry_image_fqin }} -{% if mig_controller_enable_cache|bool is true %} - - name: ENABLE_CACHED_CLIENT - value: "true" -{% endif %} {% if http_proxy|length >0 %} - name: HTTP_PROXY value: {{ http_proxy }} diff --git a/roles/migrationcontroller/templates/controller_config.yml.j2 b/roles/migrationcontroller/templates/controller_config.yml.j2 index 13f83512..ad73e567 100644 --- a/roles/migrationcontroller/templates/controller_config.yml.j2 +++ b/roles/migrationcontroller/templates/controller_config.yml.j2 @@ -61,3 +61,4 @@ data: {% if pv_resizing_threshold is defined %} PV_RESIZING_USAGE_THRESHOLD: "{{ pv_resizing_threshold }}" {% endif %} + ENABLE_CACHED_CLIENT: "{{ mig_controller_enable_cache }}" \ No newline at end of file