[patch] Modify manage encryption vars

Author: Bhautik Vala

src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -660,19 +660,19 @@ spec:
       value: "{{ mas_app_settings_customization_archive_password }}"
     {%- endif %}
   {%- endif %}
-  {%- if mas_app_settings_crypto_key is defined and mas_app_settings_crypto_key != "" %}
-    - name: mas_app_settings_crypto_key
-      value: "{{ mas_app_settings_crypto_key }}"
-    - name: mas_app_settings_cryptox_key
-      value: "{{ mas_app_settings_cryptox_key }}"
-    - name: mas_app_settings_old_crypto_key
-      value: "{{ mas_app_settings_old_crypto_key }}"
-    - name: mas_app_settings_old_cryptox_key
-      value: "{{ mas_app_settings_old_cryptox_key }}"
-  {%- endif %}
-  {%- if mas_app_settings_override_encryption_secrets_flag is defined and mas_app_settings_override_encryption_secrets_flag != "" %}
-    - name: mas_app_settings_override_encryption_secrets_flag
-      value: "{{ mas_app_settings_override_encryption_secrets_flag }}"
+  {%- if mas_manage_encryptionsecret_crypto_key is defined and mas_manage_encryptionsecret_crypto_key != "" %}
+    - name: mas_manage_encryptionsecret_crypto_key
+      value: "{{ mas_manage_encryptionsecret_crypto_key }}"
+    - name: mas_manage_encryptionsecret_cryptox_key
+      value: "{{ mas_manage_encryptionsecret_cryptox_key }}"
+    - name: mas_manage_encryptionsecret_old_crypto_key
+      value: "{{ mas_manage_encryptionsecret_old_crypto_key }}"
+    - name: mas_manage_encryptionsecret_old_cryptox_key
+      value: "{{ mas_manage_encryptionsecret_old_cryptox_key }}"
+  {%- endif %}
+  {%- if mas_manage_ws_db_encryptionsecret is defined and mas_manage_ws_db_encryptionsecret != "" %}
+    - name: mas_manage_ws_db_encryptionsecret
+      value: "{{ mas_manage_ws_db_encryptionsecret }}"
   {%- endif %}
   {%- if mas_app_settings_default_jms is defined and mas_app_settings_default_jms != "" %}
     - name: mas_app_settings_default_jms

src/mas/devops/templates/pipelinerun-upgrade.yml.j2

@@ -215,19 +215,19 @@ spec:
       value: "{{ mas_app_settings_customization_archive_password }}"
     {%- endif %}
   {%- endif %}
-  {%- if mas_app_settings_crypto_key is defined and mas_app_settings_crypto_key != "" %}
-    - name: mas_app_settings_crypto_key
-      value: "{{ mas_app_settings_crypto_key }}"
-    - name: mas_app_settings_cryptox_key
-      value: "{{ mas_app_settings_cryptox_key }}"
-    - name: mas_app_settings_old_crypto_key
-      value: "{{ mas_app_settings_old_crypto_key }}"
-    - name: mas_app_settings_old_cryptox_key
-      value: "{{ mas_app_settings_old_cryptox_key }}"
-  {%- endif %}
-  {%- if mas_app_settings_override_encryption_secrets_flag is defined and mas_app_settings_override_encryption_secrets_flag != "" %}
-    - name: mas_app_settings_override_encryption_secrets_flag
-      value: "{{ mas_app_settings_override_encryption_secrets_flag }}"
+  {%- if mas_manage_encryptionsecret_crypto_key is defined and mas_manage_encryptionsecret_crypto_key != "" %}
+    - name: mas_manage_encryptionsecret_crypto_key
+      value: "{{ mas_manage_encryptionsecret_crypto_key }}"
+    - name: mas_manage_encryptionsecret_cryptox_key
+      value: "{{ mas_manage_encryptionsecret_cryptox_key }}"
+    - name: mas_manage_encryptionsecret_old_crypto_key
+      value: "{{ mas_manage_encryptionsecret_old_crypto_key }}"
+    - name: mas_manage_encryptionsecret_old_cryptox_key
+      value: "{{ mas_manage_encryptionsecret_old_cryptox_key }}"
+  {%- endif %}
+  {%- if mas_manage_ws_db_encryptionsecret is defined and mas_manage_ws_db_encryptionsecret != "" %}
+    - name: mas_manage_ws_db_encryptionsecret
+      value: "{{ mas_manage_ws_db_encryptionsecret }}"
   {%- endif %}
   {%- if mas_app_settings_default_jms is defined and mas_app_settings_default_jms != "" %}
     - name: mas_app_settings_default_jms