Merge pull request #2463 from mgCepeda/hotfix

[fabric] Hotfix init required
hyperledger · Dec 28, 2023 · 62800ef · 62800ef
2 parents 3ebf2ec + 53ddb61
commit 62800ef
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/platforms/hyperledger-fabric/charts/fabric-chaincode-commit/templates/commit_chaincode.yaml b/platforms/hyperledger-fabric/charts/fabric-chaincode-commit/templates/commit_chaincode.yaml
@@ -221,7 +221,7 @@ spec:
  if [ "${INIT_REQUIRED}" = "true" ]
  then
  init_flag=" --init-required"
- APPROVE_CMD=${COMMIT_CMD}${init_flag}
+ COMMIT_CMD=${COMMIT_CMD}${init_flag}
  fi
 
  for item in $ENDORSERS_CORE_PEER_ADDR

diff --git a/...yperledger-fabric/configuration/roles/create/chaincode/invoke/tasks/nested_valuefile.yaml b/...yperledger-fabric/configuration/roles/create/chaincode/invoke/tasks/nested_valuefile.yaml
@@ -12,4 +12,4 @@
  loop: "{{ peer_chaincodes }}"
  loop_control:
  loop_var: chaincode
- when: chaincode.name in item.chaincodes
+ when: chaincode.name in item.chaincodes and chaincode.init_required == true
diff --git a/...hyperledger-fabric/configuration/roles/helm_component/templates/approve_chaincode_job.tpl b/...hyperledger-fabric/configuration/roles/helm_component/templates/approve_chaincode_job.tpl
@@ -57,6 +57,7 @@ spec:
  lang: {{ component_chaincode.lang | default('golang') }}
  commitarguments: {{ component_chaincode.arguments | default('') | quote }}
  endorsementpolicies: {{ component_chaincode.endorsements | default('') | quote }}
+ initrequired: {{ component_chaincode.init_required }}
 {% if component_chaincode.repository is defined %}
  repository:
  hostname: "{{ component_chaincode.repository.url.split('/')[0] | lower }}"

diff --git a/.../hyperledger-fabric/configuration/roles/helm_component/templates/commit_chaincode_job.tpl b/.../hyperledger-fabric/configuration/roles/helm_component/templates/commit_chaincode_job.tpl
@@ -59,6 +59,7 @@ spec:
  sequence: {{ component_chaincode.sequence | default('1') }}
  commitarguments: {{ component_chaincode.arguments | default('') | quote }}
  endorsementpolicies: {{ component_chaincode.endorsements | default('') | quote }}
+ initrequired: {{ component_chaincode.init_required }}
 {% if component_chaincode.repository is defined %}
  repository:
  hostname: "{{ component_chaincode.repository.url.split('/')[0] | lower }}"