fix: remove duplicate register var and fix anchorpeer chart

Signed-off-by: Sownak Roy <[email protected]>

Author: sownak

platforms/hyperledger-fabric/charts/fabric-channel-join/templates/anchorpeer.yaml

@@ -176,24 +176,24 @@ spec:
             configtxlator proto_decode --input config_block.pb --type common.Block --output config_block.json 
             jq .data.data[0].payload.data.config config_block.json >"${CORE_PEER_LOCALMSPID}config.json"
 
-            CHECK_ANCHOR=$(jq '.channel_group.groups.Application.groups.'${CORE_PEER_LOCALMSPID}'.values.AnchorPeers.value.anchor_peers' ${CORE_PEER_LOCALMSPID}config.json)
+            CHECK_ANCHOR=$(jq '.channel_group.groups.Application.groups."'${CORE_PEER_LOCALMSPID}'".values.AnchorPeers.value.anchor_peers' ${CORE_PEER_LOCALMSPID}config.json)
 
             PORT="${CORE_PEER_ADDRESS##*:}"
             HOST="${CORE_PEER_ADDRESS%%:*}"
             if echo "$CHECK_ANCHOR" | grep -q "$HOST"; then
                 echo "The anchopeer has already been created"
             else 
-              jq '.channel_group.groups.Application.groups.'${CORE_PEER_LOCALMSPID}'.values += {"AnchorPeers":{"mod_policy": "Admins","value":{"anchor_peers": [{"host": "'$HOST'","port": '$PORT'}]},"version": "0"}}' ${CORE_PEER_LOCALMSPID}config.json > ${CORE_PEER_LOCALMSPID}modified_config.json
+              jq '.channel_group.groups.Application.groups."'${CORE_PEER_LOCALMSPID}'".values += {"AnchorPeers":{"mod_policy": "Admins","value":{"anchor_peers": [{"host": "'$HOST'","port": '$PORT'}]},"version": "0"}}' ${CORE_PEER_LOCALMSPID}config.json > ${CORE_PEER_LOCALMSPID}modified_config.json
 
               configtxlator proto_encode --input "${CORE_PEER_LOCALMSPID}config.json" --type common.Config --output original_config.pb
               configtxlator proto_encode --input "${CORE_PEER_LOCALMSPID}modified_config.json" --type common.Config --output modified_config.pb
               configtxlator compute_update --channel_id "${CHANNEL_NAME}" --original original_config.pb --updated modified_config.pb --output config_update.pb
               configtxlator proto_decode --input config_update.pb --type common.ConfigUpdate --output config_update.json
-              echo '{"payload":{"header":{"channel_header":{"channel_id":"'$CHANNEL_NAME'", "type":2}},"data":{"config_update":'$(cat config_update.json)'}}}' | jq . >config_update_in_envelope.json
+              echo '{"payload":{"header":{"channel_header":{"channel_id":"'$CHANNEL_NAME'", "type":2}},"data":{"config_update":'$(cat config_update.json)'}}}' | jq . > config_update_in_envelope.json
               configtxlator proto_encode --input config_update_in_envelope.json --type common.Envelope --output "${CORE_PEER_LOCALMSPID}anchors.tx"
 
               peer channel update -o ${ORDERER_URL} -c ${CHANNEL_NAME} -f ${CORE_PEER_LOCALMSPID}anchors.tx --tls --cafile ${ORDERER_CA}   
-            fi   
+            fi
           else
             echo "Updating anchor peer for the channel ${CHANNEL_NAME}"
             tls_status=${CORE_PEER_TLS_ENABLED}

platforms/hyperledger-fabric/configuration/roles/create/peers/tasks/nested_main.yaml

@@ -58,6 +58,7 @@
 
 - name: Get information about StorageClasses
   kubernetes.core.k8s_info:
+    kubeconfig: "{{ kubernetes.config_file }}"
     kind: StorageClass
     api_version: storage.k8s.io/v1
     namespace: default

platforms/hyperledger-fabric/configuration/roles/delete/vault_secrets/meta/main.yaml

@@ -12,12 +12,3 @@ dependencies:
         os: "{{ install_os }}"
         arch: "{{ install_arch }}"
         bin_directory: "{{ bin_install_dir }}"
-  - role: "{{playbook_dir}}/../../shared/configuration/roles/setup/aws-auth"
-    vars:
-      aws_authenticator:
-        os: "{{ install_os }}"
-        arch: "{{ install_arch }}"
-        bin_directory: "{{ bin_install_dir }}"
-      kubeconfig_path: "{{ item.k8s.config_file }}"
-      kubecontext: "{{ item.k8s.context }}"
-    when: "item.cloud_provider == 'aws'"

platforms/shared/configuration/roles/check/helm_component/tasks/main.yaml

@@ -23,12 +23,11 @@
     context: "{{ kubernetes.context }}"
     label_selectors:
       - "app = {{ component_name }}"
-  register: component_data
+  register: job_data
   retries: "{{ network.env.retry_count }}"
   delay: 30
-  until: component_data.resources|length > 0 and ((component_data.resources[0].status.phase is defined and component_data.resources[0].status.phase == "Succeeded") or (component_data.resources[0].status.succeeded is defined and component_data.resources[0].status.succeeded == 1))
+  until: job_data.resources|length > 0 and ((job_data.resources[0].status.phase is defined and job_data.resources[0].status.phase == "Succeeded") or (job_data.resources[0].status.succeeded is defined and job_data.resources[0].status.succeeded == 1))
   when: component_type == "Job"
-  register: job_retry_result
 
 # Output debug message if Job creation fails after retries
 - name: Debug information for job {{ component_name }} failure
@@ -43,7 +42,7 @@
       Run 'kubectl describe job -n {{ namespace }} -l app={{ component_name }}' for more details.
   when:
     - component_type == "Job"
-    - job_retry_result.failed is defined and job_retry_result.failed
+    - job_data.failed is defined and job_data.failed
 
 # one time job check and registers the result variable
 - name: "Check for job {{ component_name }} in {{ namespace }}"
@@ -80,7 +79,6 @@
   delay: "{{ delay | default(30) }}"
   until: component_data.resources|length > 0
   when: component_type == "Pod"
-  register: pod_retry_result
 
 # Output debug message if Pod creation fails after retries
 - name: Debug information for pod {{ component_name }} failure
@@ -95,14 +93,14 @@
       Run 'kubectl describe pod -n {{ namespace }} -l {{ label_selectors | join(",") }}' for detailed events.
   when:
     - component_type == "Pod"
-    - pod_retry_result.failed is defined and pod_retry_result.failed
+    - component_data.failed is defined and component_data.failed
 
 # Print a warning message if job is still running/pending after retries but not failed
 - name: Status update for job {{ component_name }}
   debug:
     msg: "Job {{ component_name }} in namespace {{ namespace }} is still running or pending. Consider increasing retry_count or checking for issues in the job configuration."
   when:
     - component_type == "Job"
-    - job_retry_result.failed is not defined or not job_retry_result.failed
-    - component_data.resources|length > 0 
-    - (component_data.resources[0].status.phase is not defined or component_data.resources[0].status.phase != "Succeeded") and (component_data.resources[0].status.succeeded is not defined or component_data.resources[0].status.succeeded != 1)
+    - job_data.failed is not defined or not job_data.failed
+    - job_data.resources|length > 0 
+    - (job_data.resources[0].status.phase is not defined or job_data.resources[0].status.phase != "Succeeded") and (job_data.resources[0].status.succeeded is not defined or job_data.resources[0].status.succeeded != 1)

platforms/shared/configuration/roles/check/k8_component/tasks/main.yaml

@@ -43,7 +43,6 @@
   when: 
     - component_type == "Namespace" or component_type == "ClusterRoleBinding" or component_type == "StorageClass"
     - type is undefined or type == "retry"
-  register: retry_result
 
 # Output debug message if component creation fails after retries
 - name: Debug information for {{ component_type }} {{ component_name }} failure
@@ -58,7 +57,7 @@
   when:
     - component_type == "Namespace" or component_type == "ClusterRoleBinding" or component_type == "StorageClass"
     - type is undefined or type == "retry"
-    - retry_result.failed is defined and retry_result.failed
+    - component_data.failed is defined and component_data.failed
 
 # Task to check if ServiceAccount is created
 # This task will try for a maximum number of iterations defined in env.retry_count of network.yaml with an interval of
@@ -94,7 +93,6 @@
   delay: 35
   until: component_data.resources|length > 0
   when: (component_type == "ServiceAccount" and (type is undefined or type == 'retry'))
-  register: sa_retry_result
 
 # Output debug message if ServiceAccount creation fails after retries
 - name: Debug information for {{ component_type }} {{ component_name }} failure
@@ -108,4 +106,4 @@
       Check the Kubernetes events and logs for more details.
   when:
     - component_type == "ServiceAccount" and (type is undefined or type == 'retry')
-    - sa_retry_result.failed is defined and sa_retry_result.failed
+    - component_data.failed is defined and component_data.failed

platforms/shared/configuration/roles/check/setup/tasks/main.yaml

@@ -66,7 +66,6 @@
   delay: 30
   until: vault_result.failed == False
   when: check == "crypto_materials"
-  register: vault_retry_result
 
 # Output debug message if vault operation fails after retries
 - name: Debug information for vault failure
@@ -81,15 +80,15 @@
       Verify Vault status with 'vault status' and check that the crypto generation process completed successfully.
   when:
     - check == "crypto_materials"
-    - vault_retry_result.failed is defined and vault_retry_result.failed
+    - vault_result.failed is defined and vault_result.failed
 
 # Log success message when crypto materials are found
 - name: Log successful crypto materials check
   debug:
     msg: "Successfully found crypto materials at {{ vault_path }} in Vault."
   when:
     - check == "crypto_materials"
-    - vault_retry_result.failed is not defined or not vault_retry_result.failed
+    - vault_result.failed is not defined or not vault_result.failed
 
 # This task check if certs exists in vault.
 - name: check if certs exists in vault.

platforms/shared/configuration/roles/create/job_component/tasks/main.yaml

@@ -45,7 +45,7 @@
       - "{{ values_dir }}/{{ component_name }}.yaml"
     force: true
     wait: true
-    update_repo_cache: true
+    update_repo_cache: false
     kubeconfig: "{{ kubernetes.config_file }}"
   when:
     - helm_check.status is not defined

platforms/shared/configuration/roles/create/job_component/vars/main.yaml

@@ -27,10 +27,10 @@ charts:
   osn_create_channel_job: fabric-osnadmin-channel-create
   create_channel_job: fabric-channel-create
   join_channel_job: fabric-channel-join
-  bevel_alpine_version: latest
-  fabric_tools_image: bevel-fabric-tools
   indy_genesis: indy-genesis
   indy_endorser: indy-register-identity
   corda_ent_init: enterprise-init
   corda_ent_secondary_init: enterprise-init
   corda_ent_cenm: cenm
+bevel_alpine_version: latest
+fabric_tools_image: bevel-fabric-tools

platforms/shared/configuration/roles/git_push/tasks/main.yaml

@@ -36,9 +36,9 @@
   shell: |
     cd "{{ GIT_DIR }}"
     echo "---------------GIT PUSH---------------"
-    git config user.email {{ gitops.email }}
-    git config user.name {{ gitops.username }}
-    git --git-dir={{ GIT_DIR }}/.git pull
+    git config --global user.email {{ gitops.email }}
+    git config --global user.name {{ gitops.username }}
+    git --git-dir={{ GIT_DIR }}/.git pull https://{{ gitops.username }}:{{ gitops.password }}@{{ gitops.git_repo }}
     git --git-dir={{ GIT_DIR }}/.git add -A .
     
     git --git-dir={{ GIT_DIR }}/.git commit -s -m "{{ msg }}" || true

platforms/shared/configuration/roles/setup/edge-stack/meta/main.yaml

@@ -6,16 +6,6 @@
 
 ---
 dependencies:
-  - role: "aws-auth"
-    vars:
-      aws_authenticator:
-        os: "{{ install_os }}"
-        arch: "{{ install_arch }}"
-        bin_directory: "{{ bin_install_dir }}"
-        checksum: ""
-      kubeconfig_path: "{{ item.k8s.config_file }}"
-      kubecontext: "{{ item.k8s.context }}"
-    when: item.cloud_provider == 'aws'
   - role: "helm"
     vars:
       helm: