Fixed network-schema and added shared changes

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

.gitignore

@@ -40,4 +40,4 @@
 *_custom.tpl
 **/charts/*.tgz
 **/files/*.json
-requirements.lock
+requirements.lock

platforms/hyperledger-besu/charts/besu-genesis/requirements.yaml

@@ -8,4 +8,4 @@ dependencies:
  repository: "file://../../../shared/charts/bevel-scripts"
  tags:
  - bevel
- version: ~0.15.1
+ version: ~0.15.1

platforms/hyperledger-fabric/configuration/add-orderer-organization.yaml

@@ -46,10 +46,9 @@
  component_name: "{{ org.name | lower }}-vaultk8s-job"
  component_type: "{{ org.type | lower }}"
  component_ns: "{{ org.name | lower }}-net"
- component_auth: "{{ network.env.type }}{{ org.name | lower }}-net-auth"
+ component_auth: "{{ network.env.type }}{{ name }}"
  kubernetes: "{{ org.k8s }}"
  vault: "{{ org.vault }}"
- policy_type: "fabric"
  gitops: "{{ org.gitops }}"
  reset_path: "platforms/hyperledger-fabric/configuration"
  loop: "{{ network['organizations'] }}"

platforms/hyperledger-fabric/configuration/add-organization.yaml

@@ -57,10 +57,9 @@
  component_name: "{{ org.name | lower }}-vaultk8s-job"
  component_type: "{{ org.type | lower }}"
  component_ns: "{{ org.name | lower }}-net"
- component_auth: "{{ network.env.type }}{{ org.name | lower }}-net-auth"
+ component_auth: "{{ network.env.type }}{{ name }}"
  kubernetes: "{{ org.k8s }}"
  vault: "{{ org.vault }}"
- policy_type: "fabric"
  gitops: "{{ org.gitops }}"
  reset_path: "platforms/hyperledger-fabric/configuration"
  loop: "{{ network['organizations'] }}"

platforms/hyperledger-fabric/configuration/add-peer.yaml

@@ -55,10 +55,9 @@
  component_name: "{{ org.name | lower }}-vaultk8s-job"
  component_type: "{{ org.type | lower }}"
  component_ns: "{{ org.name | lower }}-net"
- component_auth: "{{ network.env.type }}{{ org.name | lower }}-net-auth"
+ component_auth: "{{ network.env.type }}{{ name }}"
  kubernetes: "{{ org.k8s }}"
  vault: "{{ org.vault }}"
- policy_type: "fabric"
  gitops: "{{ org.gitops }}"
  reset_path: "platforms/hyperledger-fabric/configuration"
  loop: "{{ network['organizations'] }}"

platforms/hyperledger-fabric/configuration/deploy-network.yaml

@@ -55,10 +55,9 @@
  component_name: "{{ org.name | lower }}-vaultk8s-job"
  component_type: "{{ org.type | lower }}"
  component_ns: "{{ org.name | lower }}-net"
- component_auth: "{{ network.env.type }}{{ org.name | lower }}-net-auth"
+ component_auth: "{{ network.env.type }}{{ name }}"
  kubernetes: "{{ org.k8s }}"
  vault: "{{ org.vault }}"
- policy_type: "fabric"
  gitops: "{{ org.gitops }}"
  loop: "{{ network['organizations'] }}"
  loop_control:
@@ -74,10 +73,9 @@
  component_name: "{{ org.name | lower }}-vaultk8s-job"
  component_type: "{{ org.type | lower }}"
  component_ns: "{{ org.name | lower }}-net"
- component_auth: "{{ org.k8s.cluster_id }}{{ component_ns }}-auth"
+ component_auth: "{{ network.env.type }}{{ name }}"
  kubernetes: "{{ org.k8s }}"
  vault: "{{ org.vault }}"
- policy_type: "fabric"
  gitops: "{{ org.gitops }}"
  reset_path: "platforms/hyperledger-fabric/configuration"
  loop: "{{ network['organizations'] }}"