Quorum node (#30)

* migrated quorum-node chart * added quorum config paths * migrated from files to value files * fixed blank lines * fixed comments * fixed annotations in values.yaml * fixed annotations in values.yaml * update chart version
PharmaLedger-IMI · Apr 13, 2022 · 659ba9a · 659ba9a
1 parent 6f2173d
commit 659ba9a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 35 deletions.
diff --git a/charts/quorum-node/Chart.yaml b/charts/quorum-node/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/quorum-node/readme.md b/charts/quorum-node/readme.md
@@ -43,7 +43,7 @@ A Helm chart for the deployment of the quorum node on Kubernetes suporting new-n
 | replicasCount | int | `1` | Number of replicas for the quorum-node !! DO NOT CHANGE !! |
 | resources | object | `{}` | Pod resources |
 | securityContext | object | `{}` |  |
-| service.annotations | object | `{"service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled":"false","service.beta.kubernetes.io/aws-load-balancer-eip-allocations":"eipalloc-0aaXXXXXXXXXXXXXX","service.beta.kubernetes.io/aws-load-balancer-healthcheck-healthy-threshold":"2","service.beta.kubernetes.io/aws-load-balancer-healthcheck-unhealthy-threshold":"2","service.beta.kubernetes.io/aws-load-balancer-ip-address-type":"ipv4","service.beta.kubernetes.io/aws-load-balancer-name":"qn-0","service.beta.kubernetes.io/aws-load-balancer-nlb-target-type":"instance","service.beta.kubernetes.io/aws-load-balancer-scheme":"internet-facing","service.beta.kubernetes.io/aws-load-balancer-subnets":"eks-ireland-1-vpc-public-eu-west-1b","service.beta.kubernetes.io/aws-load-balancer-target-group-attributes":"preserve_client_ip.enabled=true,deregistration_delay.timeout_seconds=120,deregistration_delay.connection_termination.enabled=true,stickiness.enabled=true,stickiness.type=source_ip","service.beta.kubernetes.io/aws-load-balancer-type":"external"}` | Custom service annotations |
+| service.annotations | string | `nil` | Custom service annotations |
 | service.labels | string | `nil` | Custom service labels |
 | service.spec.loadBalancerSourceRanges | string | `nil` | A list of CIDR ranges which can access the pod(s) for this service. If list is empty, Kubernetes allows traffic from 0.0.0.0/0 to the Node Security Group(s) |
 | storage.data | string | `"3Gi"` | Size for the data volume of the Quorum Node |
@@ -52,13 +52,13 @@ A Helm chart for the deployment of the quorum node on Kubernetes suporting new-n
 | tolerations | list | `[]` | Pod tolerations |
 | use_case.joinNetwork.enabled | bool | `false` | Enable the join-network use case. Can only be used in collaboration with updatePartnerInfo use case |
 | use_case.joinNetwork.genesis_file_location | string | `"https://raw.githubusercontent.com/<shared-repository>/<path>/genesis.json"` | genesis file location |
-| use_case.joinNetwork.plugin_data_common | string | `"{ \"enode\":\"08\", \"nodeAddress\":\"0x3\", \"genesis\":\"\" }"` |  |
-| use_case.joinNetwork.plugin_data_secrets | string | `"{ \"nodeKey\":\"3b\" }"` |  |
+| use_case.joinNetwork.plugin_data_common | string | `"\"{\n    \"enode\":\"08\",\n    \"nodeAddress\":\"0x3\",\n    \"genesis\":\"\"\n}\""` |  |
+| use_case.joinNetwork.plugin_data_secrets | string | `"\"{\n    \"nodeKey\":\"3b\"\n}\""` |  |
 | use_case.newNetwork.enabled | bool | `true` | Enable the new-network use case. Can only be used in collaboration with updatePartnerInfo use case |
-| use_case.newNetwork.plugin_data_common | string | `"{ \"extradata\":\"0x0\", \"enode\":\"\", \"nodeAddress\":\"\", \"genesisAccount\":\"0x89\"} }"` |  |
-| use_case.newNetwork.plugin_data_secrets | string | `"{ \"genesisKeyStoreAccount\": \"eyJhZGRyZX\", \"nodeKey\": \"47\" }"` |  |
+| use_case.newNetwork.plugin_data_common | string | `"\"{\n  \"extradata\":\"0x0\",\n  \"enode\":\"\",\n  \"nodeAddress\":\"\",\n  \"genesisAccount\":\"0x89\"\n}\""` |  |
+| use_case.newNetwork.plugin_data_secrets | string | `"\"{\n  \"genesisKeyStoreAccount\": \"eyJhZGRyZX\",\n  \"nodeKey\": \"47\"\n}\""` |  |
 | use_case.updatePartnersInfo.enabled | bool | `false` | Enable the update-partners-info use case. Can only be used in collaboration with new-network pr join-network use case |
-| use_case.updatePartnersInfo.peers | list | `["company-name"]` | List of company names who act as peers |
+| use_case.updatePartnersInfo.peers | list | `[]` | List of company names who act as peers |
 | use_case.updatePartnersInfo.plugin_data_common | string | `"{}"` |  |
 | use_case.updatePartnersInfo.shared_data_location | string | `"https://raw.githubusercontent.com/<shared-repository>/<path>"` | base URL for shared repository where the companies are located |
 

diff --git a/charts/quorum-node/values.yaml b/charts/quorum-node/values.yaml
@@ -65,30 +65,33 @@ use_case:
   newNetwork:
     # -- Enable the new-network use case. Can only be used in collaboration with updatePartnerInfo use case
     enabled: true
-    plugin_data_common: "{
-      \"extradata\":\"0x0\",
-      \"enode\":\"\",
-      \"nodeAddress\":\"\",
-      \"genesisAccount\":\"0x89\"}
-    }"
+    plugin_data_common: >-
+        "{
+          "extradata":"0x0",
+          "enode":"",
+          "nodeAddress":"",
+          "genesisAccount":"0x89"
+        }"
     plugin_data_secrets: "{
-    \"genesisKeyStoreAccount\": \"eyJhZGRyZX\",
-    \"nodeKey\": \"47\"
-    }"
+          \"genesisKeyStoreAccount\": \"eyJhZGRyZX\",
+          \"nodeKey\": \"47\"
+        }"
 
   joinNetwork:
     # -- Enable the join-network use case. Can only be used in collaboration with updatePartnerInfo use case
     enabled: false
     # -- genesis file location
     genesis_file_location: "https://raw.githubusercontent.com/<shared-repository>/<path>/genesis.json"
-    plugin_data_common: "{
-    \"enode\":\"08\",
-    \"nodeAddress\":\"0x3\",
-    \"genesis\":\"\"
-    }"
-    plugin_data_secrets: "{
-      \"nodeKey\":\"3b\"
-    }"
+    plugin_data_common: >-
+        "{
+            "enode":"08",
+            "nodeAddress":"0x3",
+            "genesis":""
+        }"
+    plugin_data_secrets: >-
+        "{
+            "nodeKey":"3b"
+        }"
 
   updatePartnersInfo:
     # -- Enable the update-partners-info use case. Can only be used in collaboration with new-network pr join-network use case
@@ -122,36 +125,36 @@ service:
   annotations:
     # Let Kubernetes In-tree LoadBalancer controller NOT process this resource (but AWS LB controller 2.2 in this case)
     # See https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/nlb/#configuration
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
+# service.beta.kubernetes.io/aws-load-balancer-type: "external"
     # We want the NLB to be Internet-facing (public)
     # See https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/annotations/#lb-scheme
-    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
+    # service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     # A custom name
     # See https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/annotations/#load-balancer-name
-    service.beta.kubernetes.io/aws-load-balancer-name: qn-0
+    # service.beta.kubernetes.io/aws-load-balancer-name: qn-0
     # Forward traffic to EC2 Instance (thus, a nodePort on the instance will be used)
     # See https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/nlb/#instance-mode_1
     # and https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/annotations/#nlb-target-type
-    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: instance
+    # service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: instance
     # IPv4 only
     # See https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/annotations/#ip-address-type
-    service.beta.kubernetes.io/aws-load-balancer-ip-address-type: ipv4
+    # service.beta.kubernetes.io/aws-load-balancer-ip-address-type: ipv4
     # Important: Preserve Client (public) IP address of caller on forwarding traffic to target
     # See https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/annotations/#target-group-attributes
-    service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: preserve_client_ip.enabled=true,deregistration_delay.timeout_seconds=120,deregistration_delay.connection_termination.enabled=true,stickiness.enabled=true,stickiness.type=source_ip
+    # service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: preserve_client_ip.enabled=true,deregistration_delay.timeout_seconds=120,deregistration_delay.connection_termination.enabled=true,stickiness.enabled=true,stickiness.type=source_ip
     # Healthcheck setting - must be within [2, 10] - defaults to 3
     # We use the mininum of 2 to add/remove targets faster from target group
-    service.beta.kubernetes.io/aws-load-balancer-healthcheck-healthy-threshold: "2"
-    service.beta.kubernetes.io/aws-load-balancer-healthcheck-unhealthy-threshold: "2"
+    # service.beta.kubernetes.io/aws-load-balancer-healthcheck-healthy-threshold: "2"
+    # service.beta.kubernetes.io/aws-load-balancer-healthcheck-unhealthy-threshold: "2"
     # Use a static Elastic IP address - Elastic IP Allocation IDs required!
     # From offical docs: Public Facing lb only. Length/order must match subnets
-    service.beta.kubernetes.io/aws-load-balancer-eip-allocations: eipalloc-0aaXXXXXXXXXXXXXX
+    # service.beta.kubernetes.io/aws-load-balancer-eip-allocations: eipalloc-0aaXXXXXXXXXXXXXX
     # We put the NLB into a certain public subnet only - You can provide the subnet ID or the value of the 'Name' tag
     # From offical docs: You must specify at least one subnet in any of the AZs, both subnetID or subnetName(Name tag on subnets) can be used.
     # See: https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.2/guide/service/annotations/#subnets
-    service.beta.kubernetes.io/aws-load-balancer-subnets: eks-ireland-1-vpc-public-eu-west-1b
+    # service.beta.kubernetes.io/aws-load-balancer-subnets: eks-ireland-1-vpc-public-eu-west-1b
     # Only set to true if NLBs subnet is in a different availability zone than the zone affinity of the deployment.
-    service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "false"
+    # service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "false"
     # 1. Load Balancer Proxy Protocol does not work for HTTP based workload!
     # 2. We do not need the Load Balancer Proxy Protocol in our use case, therefore we do not enable it
     # service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"