diff --git a/platforms/quorum/charts/quorum-tessera-key-mgmt/templates/job.yaml b/platforms/quorum/charts/quorum-tessera-key-mgmt/templates/job.yaml index 72d88b739a9..72daf534166 100644 --- 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 index 50bea0a2e86..0507f6a5bce 100644 --- 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 index 3001c561230..614d4cba9ca 100644 --- 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 index ffbd5a7340d..f8c9c3a086e 100644 --- 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 index 28dbdac4199..b1acef6e440 100644 --- 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 index a840185ec93..485649b1176 100644 --- 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 index b1f5f7f93e0..72f6b0d6ce0 100644 --- 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 index baef8dd14f8..74d4c9fe9d6 100644 --- 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 index 41e811d47fb..d7bae03456b 100755 --- 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 index 7af6f2c94ff..f26a3736eb9 100644 --- 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 }}