[patch] Revert due to dict key issue

Author: unnati-solanki-git

ibm/mas_devops/roles/ocp_idms/tasks/update-pull-secret-dev.yml

@@ -6,14 +6,12 @@
 - name: "update-pull-secret-dev : Set new secret content"
   vars:
     artifactoryAuthB64: "{{ artifactory_auth | b64encode }}"
+    content:
+      - "{\"auths\":{\"{{ fvt_image_registry }}\":{\"username\":\"{{ artifactory_username }}\",\"password\":\"{{ artifactory_token }}\",\"email\":\"{{ artifactory_username }}\",\"auth\":\"{{ artifactoryAuthB64 }}\"}"
+      - "}"
+      - "}"
   set_fact:
-    new_secret_dev:
-      auths:
-        "{{ fvt_image_registry }}":
-          username: "{{ artifactory_username }}"
-          password: "{{ artifactory_token }}"
-          email: "{{ artifactory_username }}"
-          auth: "{{ artifactoryAuthB64 }}"
+    new_secret_dev: "{{ content | join('') }}"
   no_log: true
 
 # 1.2 Find the existing secret, and we are going to modify it rather than replace
@@ -38,14 +36,37 @@
   no_log: true
 
 # 1.3 Append our new credentials to the secret
-- name: "update-pull-secret-dev : Combine new secret content"
+- name: "update-pull-secret-dev : Convert new secret to dict"
   set_fact:
-    new_secret_string: '{{ secret_string | combine( new_secret_dev, recursive=True) }}'
+    new_secret_dev_dict: "{{ new_secret_dev | from_json }}"
   no_log: true
 
+- name: "update-pull-secret-dev : Debug registry URL"
+  debug:
+    msg: "Adding credentials for registry: {{ fvt_image_registry }}"
+
+- name: "update-pull-secret-dev : Debug existing auths count"
+  debug:
+    msg: "Existing auths count: {{ secret_string.auths | length }}"
+
+- name: "update-pull-secret-dev : Debug new auths count"
+  debug:
+    msg: "New auths count: {{ new_secret_dev_dict.auths | length }}"
+
+- name: "update-pull-secret-dev : Merge secrets"
+  set_fact:
+    new_secret_string: "{{ secret_string | combine(new_secret_dev_dict, recursive=True, list_merge='append') }}"
+  no_log: true
+
+- name: "update-pull-secret-dev : Debug merged auths count"
+  debug:
+    msg: "Merged auths count: {{ new_secret_string.auths | length }}"
+
 # 1.4. Overwrite the secret
 - name: "update-pull-secret-dev : Update new pull-secret"
   kubernetes.core.k8s:
+    state: present
+    force: true
     definition:
       apiVersion: v1
       kind: Secret

ibm/mas_devops/roles/ocp_idms/tasks/update-pull-secret.yml

@@ -6,14 +6,12 @@
 - name: "update-pull-secret : Set new secret content"
   vars:
     registryAuthB64: "{{ registry_auth | b64encode }}"
+    content:
+      - "{\"auths\":{\"{{ registry_private_url }}\":{\"username\":\"{{ registry_username }}\",\"password\":\"{{ registry_password }}\",\"email\":\"{{ registry_username }}\",\"auth\":\"{{ registryAuthB64 }}\"}"
+      - "}"
+      - "}"
   set_fact:
-    new_secret:
-      auths:
-        "{{ registry_private_url }}":
-          username: "{{ registry_username }}"
-          password: "{{ registry_password }}"
-          email: "{{ registry_username }}"
-          auth: "{{ registryAuthB64 }}"
+    new_secret: "{{ content | join('') }}"
   no_log: true
 
 # 1.2 Find the existing secret, and we are going to modify it rather than replace
@@ -38,14 +36,37 @@
   no_log: true
 
 # 1.3 Append our new credentials to the secret
-- name: "update-pull-secret : Combine new secret content"
+- name: "update-pull-secret : Convert new secret to dict"
   set_fact:
-    new_secret_string: '{{ secret_string | combine(new_secret, recursive=True) }}'
+    new_secret_dict: "{{ new_secret | from_json }}"
   no_log: true
 
+- name: "update-pull-secret : Debug registry URL"
+  debug:
+    msg: "Adding credentials for registry: {{ registry_private_url }}"
+
+- name: "update-pull-secret : Debug existing auths count"
+  debug:
+    msg: "Existing auths count: {{ secret_string.auths | length }}"
+
+- name: "update-pull-secret : Debug new auths count"
+  debug:
+    msg: "New auths count: {{ new_secret_dict.auths | length }}"
+
+- name: "update-pull-secret : Merge secrets"
+  set_fact:
+    new_secret_string: "{{ secret_string | combine(new_secret_dict, recursive=True, list_merge='append') }}"
+  no_log: true
+
+- name: "update-pull-secret : Debug merged auths count"
+  debug:
+    msg: "Merged auths count: {{ new_secret_string.auths | length }}"
+
 # 1.4. Overwrite the secret
 - name: "update-pull-secret : Update new pull-secret"
   kubernetes.core.k8s:
+    state: present
+    force: true
     definition:
       apiVersion: v1
       kind: Secret