feat(quorum): update vault authentication path

Changes: - Update Quorum codebase to use the correct authPath. - Update containers to start with 'sh' as the default shell. These changes will facilitate the smooth deployment and reset of the Quorum network. fixes #quick-fixes Signed-off-by: saurabhkumarkardam <saurabh.kumar.kardam@accenture.com>
hyperledger · Jan 23, 2024 · 67ca0c9 · 67ca0c9
1 parent a7195d5
commit 67ca0c9
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/platforms/quorum/charts/quorum-tessera-key-mgmt/templates/job.yaml b/platforms/quorum/charts/quorum-tessera-key-mgmt/templates/job.yaml
@@ -58,7 +58,7 @@ spec:
             value: "{{ $.Values.vault.tmprefix }}"
           - name: VAULT_TYPE
             value: "{{ $.Values.vault.type }}"
-          command: ["/bin/bash", "-c"]
+          command: ["/bin/sh", "-c"]
           args:
             - |-
               #!/usr/bin/env bash

diff --git a/platforms/quorum/charts/quorum-tessera-node/templates/deployment.yaml b/platforms/quorum/charts/quorum-tessera-node/templates/deployment.yaml
@@ -165,7 +165,7 @@ spec:
       - name: tessera
         image: {{ .Values.images.tessera }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash", "-c"]
+        command: ["/bin/sh", "-c"]
         args:
           - |-
             #!/usr/bin/env bash

diff --git a/platforms/quorum/charts/quorum-tlscerts-gen/templates/job.yaml b/platforms/quorum/charts/quorum-tlscerts-gen/templates/job.yaml
@@ -112,7 +112,7 @@ spec:
             - name: MOUNT_PATH
               value: "/certcheck"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: ["/bin/bash", "-c"]
+          command: ["/bin/sh", "-c"]
           args:
           - |-
             if [ -e ${MOUNT_PATH}/present.txt ]
@@ -194,7 +194,7 @@ spec:
                value: "/certcheck"
              - name: VAULT_TYPE
                value: "{{ $.Values.vault.type }}"
-          command: ["/bin/bash", "-c"]
+          command: ["/bin/sh", "-c"]
           args:
           - |-
             #!/usr/bin/env sh

diff --git a/platforms/quorum/configuration/roles/helm_component/templates/certs-ambassador-quorum.tpl b/platforms/quorum/configuration/roles/helm_component/templates/certs-ambassador-quorum.tpl
@@ -27,7 +27,7 @@ spec:
     vault:
       address: {{ vault.url }}
       role: vault-role
-      authpath: quorum{{ org_name }}
+      authpath: {{ network.env.type }}{{ org_name }}
       serviceaccountname: vault-auth
       certsecretprefix: {{ vault.secret_path | default('secretsv2') }}/data/{{ org.name | lower }}
       retries: 30

diff --git a/platforms/quorum/configuration/roles/helm_component/templates/crypto_ibft_job.tpl b/platforms/quorum/configuration/roles/helm_component/templates/crypto_ibft_job.tpl
@@ -29,7 +29,7 @@ spec:
     vault:
       address: {{ vault.url }}
       role: vault-role
-      authpath: quorum{{ org_name }}
+      authpath: {{ network.env.type }}{{ org_name }}
       serviceaccountname: vault-auth
       certsecretprefix: {{ vault.secret_path | default('secretsv2') }}/data/{{ org.name | lower }}
       retries: 30

diff --git a/platforms/quorum/configuration/roles/helm_component/templates/crypto_raft_job.tpl b/platforms/quorum/configuration/roles/helm_component/templates/crypto_raft_job.tpl
@@ -29,7 +29,7 @@ spec:
     vault:
       address: {{ vault.url }}
       role: vault-role
-      authpath: quorum{{ org_name }}
+      authpath: {{ network.env.type }}{{ org_name }}
       serviceaccountname: vault-auth
       certsecretprefix: {{ vault.secret_path | default('secretsv2') }}/data/{{ org.name | lower }}
       retries: 30

diff --git a/platforms/quorum/configuration/roles/helm_component/templates/crypto_tessera.tpl b/platforms/quorum/configuration/roles/helm_component/templates/crypto_tessera.tpl
@@ -27,7 +27,7 @@ spec:
     vault:
       address: {{ vault.url }}
       secretengine: {{ vault.secret_path | default('secretsv2') }}
-      authpath: quorum{{ org_name }}
+      authpath: {{ network.env.type }}{{ org_name }}
       keyprefix: {{ org_name }}/crypto
       role: vault-role
       serviceaccountname: vault-auth

diff --git a/platforms/quorum/configuration/roles/helm_component/templates/memberquorum.tpl b/platforms/quorum/configuration/roles/helm_component/templates/memberquorum.tpl
@@ -60,7 +60,7 @@ spec:
       keyname: quorum
       tm_keyname: tm
       role: vault-role
-      authpath: quorum{{ name }}
+      authpath: {{ network.env.type }}{{ name }}
 
 {% if network.config.transaction_manager != "none" %}
     tessera:

diff --git a/platforms/quorum/configuration/roles/helm_component/templates/tessera.tpl b/platforms/quorum/configuration/roles/helm_component/templates/tessera.tpl
@@ -48,7 +48,7 @@ spec:
       serviceaccountname: vault-auth
       keyname: quorum
       role: vault-role
-      authpath: quorum{{ name }}
+      authpath: {{ network.env.type }}{{ name }}
       type: {{ vault.type | default("hashicorp") }}
     tessera:
       dburl: "jdbc:mysql://{{ peer.name }}-tessera:3306/demodb"

diff --git a/platforms/quorum/configuration/roles/helm_component/templates/validatorquorum.tpl b/platforms/quorum/configuration/roles/helm_component/templates/validatorquorum.tpl
@@ -54,7 +54,7 @@ spec:
       serviceaccountname: vault-auth
       keyname: quorum
       role: vault-role
-      authpath: quorum{{ name }}
+      authpath: {{ network.env.type }}{{ name }}
       type: {{ vault.type | default("hashicorp") }}
     genesis: {{ genesis }}
     staticnodes: {{ staticnodes }}