Merge pull request #2347 from mgCepeda/feature-2346

[fabric] update orderer pods and update required image versions compatible with 2.5.x
hyperledger · Aug 23, 2023 · b93d1f1 · b93d1f1
2 parents 5092476 + cfe93ee
commit b93d1f1
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 8 deletions.
diff --git a/platforms/hyperledger-fabric/charts/generate_cacerts/values.yaml b/platforms/hyperledger-fabric/charts/generate_cacerts/values.yaml
@@ -15,9 +15,6 @@ metadata:
   #Eg. namespace: org1-example-com
   namespace: default
   images:
-    #Provide the valid image name and version for fabric tools
-    #Eg. fabric-tools: hyperledger/fabrictools:1.4.0
-    fabrictools:
     #Provide the valid image name and version to read certificates from vault server
     #Eg.alpineutils: hyperledgerlabs/alpine-utils:1.0
     alpineutils:

diff --git a/platforms/hyperledger-fabric/charts/orderernode/templates/configmap.yaml b/platforms/hyperledger-fabric/charts/orderernode/templates/configmap.yaml
@@ -34,7 +34,7 @@ data:
   ORDERER_KAFKA_RETRY_SHORTTOTAL: "30s"
   ORDERER_KAFKA_VERBOSE: "true"
   GODEBUG: "netdns=go"
-  ORDERER_OPERATIONS_LISTENADDRESS: 0.0.0.0:9443
+  ORDERER_OPERATIONS_LISTENADDRESS: 0.0.0.0:10443
 
 ---
 apiVersion: v1

diff --git a/platforms/hyperledger-fabric/charts/orderernode/templates/deployment.yaml b/platforms/hyperledger-fabric/charts/orderernode/templates/deployment.yaml
@@ -200,7 +200,7 @@ spec:
         ports:
         - containerPort: 7050
         - name: operations
-          containerPort: 9443
+          containerPort: 10443
         envFrom:
         - configMapRef:
             name: {{ $.Values.orderer.name }}-config

diff --git a/platforms/hyperledger-fabric/charts/orderernode/templates/service.yaml b/platforms/hyperledger-fabric/charts/orderernode/templates/service.yaml
@@ -134,5 +134,5 @@ spec:
           service:
             name: {{ $.Values.orderer.name }}
             port:
-              number: 9443
+              number: 10443
 {{ end }}
diff --git a/platforms/hyperledger-fabric/configuration/roles/create/ca_server/tasks/main.yaml b/platforms/hyperledger-fabric/configuration/roles/create/ca_server/tasks/main.yaml
@@ -41,7 +41,6 @@
     git_branch: "{{ gitops.branch }}"
     charts_dir: "{{ gitops.chart_source }}"
     vault: "{{ item.vault }}"
-    fabrictools_image: "hyperledger/fabric-tools:{{ network.version }}"
     alpine_image: "{{ docker_url }}/alpine-utils:1.0"
     values_dir: "{{playbook_dir}}/../../../{{ gitops.release_dir }}/{{ component }}"
   when: certs_created.failed == True

diff --git a/platforms/hyperledger-fabric/configuration/roles/create/ca_server/vars/main.yaml b/platforms/hyperledger-fabric/configuration/roles/create/ca_server/vars/main.yaml
@@ -11,3 +11,4 @@ ca_image_version:
   2.0.0: 1.4.5
   2.2.0: 1.4.8
   2.2.2: 1.4.8
+  2.5.4: latest
diff --git a/platforms/hyperledger-fabric/configuration/roles/create/peers/vars/main.yaml b/platforms/hyperledger-fabric/configuration/roles/create/peers/vars/main.yaml
@@ -11,3 +11,4 @@ couchdb_image_version:
   2.0.0: "hyperledger/fabric-couchdb:0.4.18"
   2.2.0: "couchdb:3.1"
   2.2.2: "couchdb:3.1"
+  2.5.4: "couchdb:3.3.2"
diff --git a/platforms/hyperledger-fabric/configuration/roles/helm_component/templates/cacerts_job.tpl b/platforms/hyperledger-fabric/configuration/roles/helm_component/templates/cacerts_job.tpl
@@ -22,7 +22,6 @@ spec:
       component_name: {{ component }}-net
       namespace: {{ component_ns }}    
       images:
-        fabrictools: {{ fabrictools_image }}
         alpineutils: {{ alpine_image }}
 
     vault: