[r3-corda] Updated for latest charts

Signed-off-by: sownak.roy <[email protected]>
sownak · Mar 22, 2024 · 3c14704 · 3c14704
1 parent 9f20e08
commit 3c14704
Show file tree

Hide file tree

Showing 31 changed files with 212 additions and 526 deletions.
diff --git a/examples/dscp-app/configuration/deploy-dscp-app.yaml b/examples/dscp-app/configuration/deploy-dscp-app.yaml
@@ -27,7 +27,7 @@
       git_protocol: "{{ item.gitops.git_protocol | default('https') }}"
       git_url: "{{ item.gitops.git_url }}"
       git_key: "{{ item.gitops.private_key | default() }}"
-      flux_version: "0.35.0"
+      flux_version: "0.41.2"
     with_items: "{{ network.organizations }}"
 
   # Setup letsencrypt cert-manager

diff --git a/examples/identity-app/configuration/deploy-identity-app.yaml b/examples/identity-app/configuration/deploy-identity-app.yaml
@@ -33,7 +33,7 @@
         git_protocol: "{{ item.gitops.git_protocol | default('https') }}"
         git_url: "{{ item.gitops.git_url }}"
         git_key: "{{ item.gitops.private_key | default() }}"
-        flux_version: "0.35.0"
+        flux_version: "0.41.2"
       with_items: "{{ network.organizations }}"  
 
     # Deploy the Indy Webserver for trustee orgs

diff --git a/examples/supplychain-app/charts/expressapp/Chart.yaml b/examples/supplychain-app/charts/expressapp/Chart.yaml
@@ -8,4 +8,4 @@ apiVersion: v1
 appVersion: "2.0"
 description: A Helm chart for Kubernetes
 name: expressapp
-version: 0.2.0
+version: 1.0.0
diff --git a/examples/supplychain-app/charts/expressapp/templates/deployment.yaml b/examples/supplychain-app/charts/expressapp/templates/deployment.yaml
@@ -7,45 +7,45 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: {{ .Values.nodeName }}
+  name: {{ .Release.Name }}
   {{- if .Values.deployment.annotations }}
     annotations:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
   {{- end }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Values.nodeName }}
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ .Values.nodeName }}
+      app.kubernetes.io/name: {{ .Release.Name }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-      app: {{ .Values.nodeName }}
+      app: {{ .Release.Name }}
   strategy:
     type: Recreate
     rollingUpdate: null
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ .Values.nodeName }}
+        app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-        app: {{ .Values.nodeName }}
+        app: {{ .Release.Name }}
     spec:
-      hostname: {{ .Values.nodeName }}
+      hostname: {{ .Release.Name }}
       imagePullSecrets:
-        - name: {{ .Values.expressapp.pullSecrets | default "regcred" }}
+        - name: {{ .Values.expressapp.pullSecrets }}
       containers:     
       - name: expressapp
         image: {{ .Values.expressapp.image }}
         imagePullPolicy: {{ .Values.expressapp.pullPolicy }}
         env:
         - name: API_URL
-          value: "{{ .Values.expressapp.env.apiUrl }}"
+          value: "{{ .Values.expressapp.apiUrl }}"
         - name: PORT
           value: "{{ .Values.expressapp.nodePorts.targetPort }}"
         ports:

diff --git a/examples/supplychain-app/charts/expressapp/templates/service.yaml b/examples/supplychain-app/charts/expressapp/templates/service.yaml
@@ -7,66 +7,66 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.nodeName }}
-  namespace: {{ .Values.metadata.namespace }}
-  {{- if eq $.Values.proxy.provider "ambassador" }}
-  annotations:
-    getambassador.io/config: | 
-      ---
-      apiVersion: ambassador/v2
-      kind: TLSContext
-      name: {{ .Values.proxy.name }}_api_context
-      hosts:
-      - {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
-      {{ if eq .Values.proxy.type "fabric" }}
-      secret: {{ .Values.proxy.peer_name }}-{{ .Values.metadata.namespace }}-ambassador-certs.default
-      {{ else }}
-      secret: {{ .Values.proxy.peer_name }}-ambassador-certs.{{ .Values.metadata.namespace }}
-      {{ end }}
-      secret_namespacing: true
-      min_tls_version: v1.2
-      ---
-      apiVersion: ambassador/v2
-      kind: Mapping
-      name: {{ .Values.proxy.name }}_api_p2p_mapping
-      prefix: /
-      host: {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
-      service: {{ .Values.proxy.name }}-expressapi.{{ .Values.metadata.namespace }}:{{ .Values.expressapp.nodePorts.port }}
-      timeout_ms: 20000
-      tls: false
-  {{ end }}
+  name: {{ .Release.Name }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    run: {{ .Values.nodeName }}
-    app.kubernetes.io/name: {{ .Values.nodeName }}
+    run: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }} 
+    app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
-  type: {{ .Values.expressapp.serviceType }}
+  type: ClusterIP
   selector:
-    app: {{ .Values.nodeName }}
+    app: {{ .Release.Name }}
   ports:
   - port: {{ .Values.expressapp.nodePorts.port }}
     targetPort: {{ .Values.expressapp.nodePorts.targetPort }}
     protocol: TCP
-    name: {{ .Values.expressapp.nodePorts.name }}
-
+    name: tcp
+{{- if eq $.Values.proxy.provider "ambassador" }}
+---
+apiVersion: getambassador.io/v3alpha1
+kind: TLSContext
+metadata:
+  name: {{ .Values.proxy.name }}api-tlscontext
+spec:
+  hosts:
+  - {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
+  {{ if eq .Values.proxy.type "fabric" }}
+  secret: {{ .Values.proxy.name }}-{{ .Release.Namespace }}-ambassador-certs.default
+  {{ else }}
+  secret: {{ .Values.proxy.name }}-tls-certs.{{ .Release.Namespace }}
+  {{ end }}
+  secret_namespacing: true
+  min_tls_version: v1.2
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: {{ .Values.proxy.name }}api-mapping
+spec:
+  prefix: /
+  host: {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
+  service: {{ .Values.proxy.name }}-expressapi.{{ .Release.Namespace }}:{{ .Values.expressapp.nodePorts.port }}
+  timeout_ms: 20000
+{{ end }}
 {{- if eq $.Values.proxy.provider "haproxy" }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Values.nodeName }}
-  namespace:  {{ $.Values.metadata.namespace }}
+  name: {{ .Release.Name }}
+  namespace:  {{ .Release.Namespace }}
   annotations:
     kubernetes.io/ingress.class: "haproxy"
 spec:
   tls:
   - hosts:
     - {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}
     {{- if eq .Values.proxy.type "fabric" }}
-    secretName: {{ .Values.proxy.peer_name }}-{{ .Values.metadata.namespace }}-ambassador-certs
+    secretName: {{ .Values.proxy.name }}-{{ .Release.Namespace }}-ambassador-certs
     {{- else }}
-    secretName: {{ .Values.proxy.peer_name }}-ambassador-certs
+    secretName: {{ .Values.proxy.name }}-tls-certs
     {{- end }}
   rules:
   - host: {{ .Values.proxy.name }}api.{{ .Values.proxy.external_url_suffix }}

diff --git a/examples/supplychain-app/charts/expressapp/values.yaml b/examples/supplychain-app/charts/expressapp/values.yaml
@@ -10,23 +10,13 @@
 # This one is just a demo file, the file to install the helm chart will be created through
 # ANSIBLE with the values.tpl file that is in the same folder that this file. 
 
-# This will be the name of the node to create
-nodeName: 
-metadata:
-  namespace: 
-
-# The number of replicas the node will have
-replicaCount: 1
-
 deployment:
   #   annotations:
   #     key: "value"
   annotations: {}
 
 # This will group the values of the expressapp
 expressapp:
-  #This defines the service type of the node, it will always be NodePort for the expressapp
-  serviceType: 
   # The image that will be pulled from docker url
   image: 
   # The pull policy
@@ -36,11 +26,9 @@ expressapp:
   nodePorts:
       port: 3000
       targetPort: 3000
-      name: 
   # The environment variables that will store the port to be working on and the end point to ask for requests
   #Eg. apiUrl: api.blockchaincloudpoc.com
-  env:
-    apiUrl: 
+  apiUrl: 
 proxy:
   #This will be the proxy/ingress provider. Can have values "ambassador" or "haproxy"
   #Eg. provider: "haproxy"
@@ -54,6 +42,3 @@ proxy:
   #External URL of the organization
   #Eg. external_url_suffix: org1.blockchaincloudpoc.com
   external_url_suffix: 
-  #Name of the peer
-  #Eg. peer_name: peer0
-  peer_name: 
diff --git a/examples/supplychain-app/charts/frontend/Chart.yaml b/examples/supplychain-app/charts/frontend/Chart.yaml
@@ -8,4 +8,4 @@ apiVersion: v1
 appVersion: "2.0"
 description: A Helm chart for frontend deployment
 name: frontend
-version: 0.15.1
+version: 1.0.0
diff --git a/examples/supplychain-app/charts/frontend/templates/deployment.yaml b/examples/supplychain-app/charts/frontend/templates/deployment.yaml
@@ -7,23 +7,23 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: {{  .Values.nodeName  }}
+  name: {{ .Release.Name  }}
 {{- if .Values.deployment.annotations }}
   annotations:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Values.nodeName }}
-    app.kubernetes.io/name: {{ .Values.nodeName }}
+    app: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
-  replicas: {{  .Values.replicaCount  }}
+  replicas: 1
   selector:
     matchLabels:
-      app: {{ .Values.nodeName }}
-      app.kubernetes.io/name: {{ .Values.nodeName }}
+      app: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
@@ -32,12 +32,12 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ .Values.nodeName }}
-        app.kubernetes.io/name: {{ .Values.nodeName }}
+        app: {{ .Release.Name }}
+        app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
-      hostname: {{ .Values.nodeName }}
+      hostname: {{ .Release.Name }}
       imagePullSecrets:
         - name: {{ .Values.frontend.pullSecrets | default "regcred" }}
       containers:
@@ -46,7 +46,7 @@ spec:
         imagePullPolicy: {{ .Values.frontend.pullPolicy }}
         env:
         - name: REACT_APP_API_ENDPOINT
-          value: "{{  .Values.frontend.env.webserver  }}"
+          value: "{{ .Values.frontend.apiURL  }}"
         - name: REACT_APP_GMAPS_KEY
           valueFrom:
             secretKeyRef:

diff --git a/examples/supplychain-app/charts/frontend/templates/service.yaml b/examples/supplychain-app/charts/frontend/templates/service.yaml
@@ -7,17 +7,17 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.nodeName }}
-  namespace: {{ .Values.metadata.namespace }}
+  name: {{ .Release.Name }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    run: {{ .Values.nodeName }}
-    app.kubernetes.io/name: {{ .Values.nodeName }}
+    run: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
-  type: {{ .Values.frontend.serviceType }}
+  type: ClusterIP
   selector:
-    app: {{ .Values.nodeName }}
+    app: {{ .Release.Name }}
   ports:
   - port: {{ .Values.frontend.nodePorts.port }}
     targetPort: {{ .Values.frontend.nodePorts.targetPort }}
@@ -28,38 +28,38 @@ apiVersion: getambassador.io/v3alpha1
 kind: TLSContext
 metadata:
   name: {{ .Values.proxy.peer_name }}web-tlscontext
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   hosts:
   - {{ .Values.proxy.peer_name }}web.{{ .Values.proxy.external_url_suffix }}
-  secret: {{ .Values.proxy.ambassador_secret }}.{{ .Values.metadata.namespace }}
+  secret: {{ .Values.proxy.peer_name }}-tls-certs.{{ .Release.Namespace }}
   secret_namespacing: true
   min_tls_version: v1.2
 ---
 apiVersion: getambassador.io/v3alpha1
 kind: Mapping
 metadata:
   name: {{ .Values.proxy.peer_name }}web-mapping
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   prefix: /
   host: {{ .Values.proxy.peer_name }}web.{{ .Values.proxy.external_url_suffix }}
-  service: {{ .Values.proxy.peer_name }}-frontend.{{ .Values.metadata.namespace }}:{{ .Values.frontend.nodePorts.port }}
+  service: {{ .Values.proxy.peer_name }}-frontend.{{ .Release.Namespace }}:{{ .Values.frontend.nodePorts.port }}
 {{ end }}   
 {{- if eq $.Values.proxy.provider "haproxy" }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Values.nodeName }}
-  namespace:  {{ $.Values.metadata.namespace }}
+  name: {{ .Release.Name }}
+  namespace:  {{ .Release.Namespace }}
   annotations:
     kubernetes.io/ingress.class: "haproxy"
 spec:
   tls:
   - hosts:
     - {{ .Values.proxy.peer_name }}web.{{ .Values.proxy.external_url_suffix }}
-    secretName: {{ .Values.proxy.ambassador_secret }}
+    secretName: {{ .Values.proxy.peer_name }}-tls-certs
   rules:
   - host: {{ .Values.proxy.peer_name }}web.{{ .Values.proxy.external_url_suffix }}
     http: