add facade-srv, resource-srv, data importer, job order

charts/system/Chart.lock

@@ -1,43 +1,49 @@
 dependencies:
 - name: identity-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.3
+  version: 0.1.4
 - name: notification-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.2
+  version: 0.1.3
 - name: access-control-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.2
+  version: 0.1.3
 - name: ostorage-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.2
+  version: 0.1.3
 - name: scheduling-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.2
+  version: 0.1.3
 - name: rendering-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.2
+  version: 0.1.3
 - name: pdf-rendering-srv
   repository: https://restorecommerce.github.io/helm/
   version: 0.1.2
 - name: fulfillment-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.0
+  version: 0.1.1
 - name: indexing-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.0
+  version: 0.1.1
 - name: catalog-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.0
+  version: 0.1.1
 - name: invoicing-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.0
+  version: 0.1.1
 - name: ordering-srv
   repository: https://restorecommerce.github.io/helm/
-  version: 0.1.0
+  version: 0.1.1
 - name: payment-srv
+  repository: https://restorecommerce.github.io/helm/
+  version: 0.1.2
+- name: resource-srv
   repository: https://restorecommerce.github.io/helm/
   version: 0.1.0
+- name: facade-srv
+  repository: https://restorecommerce.github.io/helm/
+  version: 0.1.5
 - name: minio
   repository: https://helm.min.io
   version: 7.0.1
@@ -48,7 +54,7 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 11.8.7
 - name: kafka-manager
-  repository: https://kubernetes-charts.storage.googleapis.com
+  repository: https://charts.helm.sh/stable
   version: 2.3.2
 - name: redis
   repository: https://charts.bitnami.com/bitnami
@@ -59,5 +65,5 @@ dependencies:
 - name: kibana
   repository: https://helm.elastic.co
   version: 7.9.2
-digest: sha256:f1f07c1c0313948941c7a30ff32bc007cc7609b142b205c7f0b763c731560a62
-generated: "2020-10-20T12:05:37.888956054+03:00"
+digest: sha256:9821cdd12f352d182d5865c5c5e58c9d3c6331eef303e50a639348986b601ba5
+generated: "2021-04-01T23:27:05.351701895+03:00"

charts/system/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: system
 description: A Helm chart for the restorecommerce system
 type: application
-version: 0.1.6
+version: 0.1.7
 icon: https://avatars0.githubusercontent.com/u/8339525
 home: https://github.com/restorecommerce/system
 maintainers:
@@ -11,44 +11,50 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: identity-srv
-    version: 0.1.3
+    version: 0.1.4
     repository: https://restorecommerce.github.io/helm/
   - name: notification-srv
-    version: 0.1.2
+    version: 0.1.3
     repository: https://restorecommerce.github.io/helm/
   - name: access-control-srv
-    version: 0.1.2
+    version: 0.1.3
     repository: https://restorecommerce.github.io/helm/
   - name: ostorage-srv
-    version: 0.1.2
+    version: 0.1.3
     repository: https://restorecommerce.github.io/helm/
   - name: scheduling-srv
-    version: 0.1.2
+    version: 0.1.3
     repository: https://restorecommerce.github.io/helm/
   - name: rendering-srv
-    version: 0.1.2
+    version: 0.1.3
     repository: https://restorecommerce.github.io/helm/
   - name: pdf-rendering-srv
     version: 0.1.2
     repository: https://restorecommerce.github.io/helm/
   - name: fulfillment-srv
-    version: 0.1.0
+    version: 0.1.1
     repository: https://restorecommerce.github.io/helm/
   - name: indexing-srv
-    version: 0.1.0
+    version: 0.1.1
     repository: https://restorecommerce.github.io/helm/
   - name: catalog-srv
-    version: 0.1.0
+    version: 0.1.1
     repository: https://restorecommerce.github.io/helm/
   - name: invoicing-srv
-    version: 0.1.0
+    version: 0.1.1
     repository: https://restorecommerce.github.io/helm/
   - name: ordering-srv
-    version: 0.1.0
+    version: 0.1.1
     repository: https://restorecommerce.github.io/helm/
   - name: payment-srv
+    version: 0.1.2
+    repository: https://restorecommerce.github.io/helm/
+  - name: resource-srv
     version: 0.1.0
     repository: https://restorecommerce.github.io/helm/
+  - name: facade-srv
+    version: 0.1.5
+    repository: https://restorecommerce.github.io/helm/
   - name: minio
     version: 7.0.1
     repository: https://helm.min.io
@@ -60,7 +66,7 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
   - name: kafka-manager
     version: 2.3.2
-    repository: https://kubernetes-charts.storage.googleapis.com
+    repository: https://charts.helm.sh/stable
   - name: redis
     version: 11.2.1
     repository: https://charts.bitnami.com/bitnami

charts/system/README.md

@@ -1,6 +1,6 @@
 # system
 
-![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for the restorecommerce system
 
@@ -11,8 +11,8 @@ Due to how the ArangoDB operator CRD's get deployed, you must manually install t
 Replace the `restorecommerce` namespace with your own.
 
 ```yaml
-helm install arangodb-crd https://github.com/arangodb/kube-arangodb/releases/download/1.1.0/kube-arangodb-crd-1.1.0.tgz
-helm install --create-namespace -n restorecommerce arangodb-operator https://github.com/arangodb/kube-arangodb/releases/download/1.1.0/kube-arangodb-1.1.0.tgz
+helm install arangodb-crd https://github.com/arangodb/kube-arangodb/releases/download/1.1.5/kube-arangodb-crd-1.1.5.tgz
+helm install --create-namespace -n restorecommerce arangodb-operator https://github.com/arangodb/kube-arangodb/releases/download/1.1.5/kube-arangodb-1.1.5.tgz
 ```
 
 **Homepage:** <https://github.com/restorecommerce/system>
@@ -30,20 +30,22 @@ helm install --create-namespace -n restorecommerce arangodb-operator https://git
 | https://charts.bitnami.com/bitnami | kafka | 11.8.7 |
 | https://charts.bitnami.com/bitnami | redis | 11.2.1 |
 | https://charts.bitnami.com/bitnami | zookeeper | 5.22.1 |
+| https://charts.helm.sh/stable | kafka-manager | 2.3.2 |
 | https://helm.elastic.co | elasticsearch | 7.9.2 |
 | https://helm.elastic.co | kibana | 7.9.2 |
 | https://helm.min.io | minio | 7.0.1 |
-| https://kubernetes-charts.storage.googleapis.com | kafka-manager | 2.3.2 |
-| https://restorecommerce.github.io/helm/ | access-control-srv | 0.1.2 |
-| https://restorecommerce.github.io/helm/ | catalog-srv | 0.1.0 |
-| https://restorecommerce.github.io/helm/ | fulfillment-srv | 0.1.0 |
-| https://restorecommerce.github.io/helm/ | identity-srv | 0.1.3 |
-| https://restorecommerce.github.io/helm/ | indexing-srv | 0.1.0 |
-| https://restorecommerce.github.io/helm/ | invoicing-srv | 0.1.0 |
-| https://restorecommerce.github.io/helm/ | notification-srv | 0.1.2 |
-| https://restorecommerce.github.io/helm/ | ordering-srv | 0.1.0 |
-| https://restorecommerce.github.io/helm/ | ostorage-srv | 0.1.2 |
-| https://restorecommerce.github.io/helm/ | payment-srv | 0.1.0 |
+| https://restorecommerce.github.io/helm/ | access-control-srv | 0.1.3 |
+| https://restorecommerce.github.io/helm/ | catalog-srv | 0.1.1 |
+| https://restorecommerce.github.io/helm/ | facade-srv | 0.1.5 |
+| https://restorecommerce.github.io/helm/ | fulfillment-srv | 0.1.1 |
+| https://restorecommerce.github.io/helm/ | identity-srv | 0.1.4 |
+| https://restorecommerce.github.io/helm/ | indexing-srv | 0.1.1 |
+| https://restorecommerce.github.io/helm/ | invoicing-srv | 0.1.1 |
+| https://restorecommerce.github.io/helm/ | notification-srv | 0.1.3 |
+| https://restorecommerce.github.io/helm/ | ordering-srv | 0.1.1 |
+| https://restorecommerce.github.io/helm/ | ostorage-srv | 0.1.3 |
+| https://restorecommerce.github.io/helm/ | payment-srv | 0.1.2 |
 | https://restorecommerce.github.io/helm/ | pdf-rendering-srv | 0.1.2 |
-| https://restorecommerce.github.io/helm/ | rendering-srv | 0.1.2 |
-| https://restorecommerce.github.io/helm/ | scheduling-srv | 0.1.2 |
+| https://restorecommerce.github.io/helm/ | rendering-srv | 0.1.3 |
+| https://restorecommerce.github.io/helm/ | resource-srv | 0.1.0 |
+| https://restorecommerce.github.io/helm/ | scheduling-srv | 0.1.3 |

charts/system/README.md.gotmpl

@@ -12,8 +12,8 @@ Due to how the ArangoDB operator CRD's get deployed, you must manually install t
 Replace the `restorecommerce` namespace with your own.
 
 ```yaml
-helm install arangodb-crd https://github.com/arangodb/kube-arangodb/releases/download/1.1.0/kube-arangodb-crd-1.1.0.tgz
-helm install --create-namespace -n restorecommerce arangodb-operator https://github.com/arangodb/kube-arangodb/releases/download/1.1.0/kube-arangodb-1.1.0.tgz
+helm install arangodb-crd https://github.com/arangodb/kube-arangodb/releases/download/1.1.5/kube-arangodb-crd-1.1.5.tgz
+helm install --create-namespace -n restorecommerce arangodb-operator https://github.com/arangodb/kube-arangodb/releases/download/1.1.5/kube-arangodb-1.1.5.tgz
 ```
 
 {{ template "chart.homepageLine" . }}

charts/system/templates/job-migrations.yaml → charts/system/templates/job-1-migrations.yaml

@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "system.fullname" . }}-migrations
+  name: {{ include "system.fullname" . }}-1-migrations
   labels:
     {{- include "system.labels" . | nindent 4 }}
   annotations:
@@ -25,6 +25,32 @@ spec:
         runAsUser: {{ .Values.jobs.migrations.securityContext.runAsUser }}
         fsGroup: {{ .Values.jobs.migrations.securityContext.fsGroup }}
       restartPolicy: OnFailure
+      initContainers:
+        # TODO Wait for all services
+        - name: wait-for-facade
+          image: groundnuty/k8s-wait-for:v1.3
+          imagePullPolicy: Always
+          args:
+            - "service"
+            - "facade-srv"
+        - name: wait-for-identity
+          image: groundnuty/k8s-wait-for:v1.3
+          imagePullPolicy: Always
+          args:
+            - "service"
+            - "identity-srv"
+        - name: wait-for-resource
+          image: groundnuty/k8s-wait-for:v1.3
+          imagePullPolicy: Always
+          args:
+            - "service"
+            - "resource-srv"
+        - name: wait-for-access-control
+          image: groundnuty/k8s-wait-for:v1.3
+          imagePullPolicy: Always
+          args:
+            - "service"
+            - "access-control-srv"
       containers:
         - name: migrations
           image: "{{ .Values.jobs.migrations.image.repository }}:{{ .Values.jobs.migrations.image.tag }}"

charts/system/templates/job-data-import.yaml → charts/system/templates/job-2-data-import.yaml

@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "system.fullname" . }}-data-import
+  name: {{ include "system.fullname" . }}-2-data-import
   labels:
     {{- include "system.labels" . | nindent 4 }}
   annotations:
@@ -26,20 +26,48 @@ spec:
         fsGroup: {{ .Values.jobs.dataImport.securityContext.fsGroup }}
       restartPolicy: OnFailure
       initContainers:
+        # TODO Wait for all services
         - name: wait-for-facade
           image: groundnuty/k8s-wait-for:v1.3
           imagePullPolicy: Always
           args:
             - "service"
             - "facade-srv"
+        - name: wait-for-identity
+          image: groundnuty/k8s-wait-for:v1.3
+          imagePullPolicy: Always
+          args:
+            - "service"
+            - "identity-srv"
+        - name: wait-for-resource
+          image: groundnuty/k8s-wait-for:v1.3
+          imagePullPolicy: Always
+          args:
+            - "service"
+            - "resource-srv"
+        - name: wait-for-access-control
+          image: groundnuty/k8s-wait-for:v1.3
+          imagePullPolicy: Always
+          args:
+            - "service"
+            - "access-control-srv"
       containers:
         - name: data-import
           image: "{{ .Values.jobs.dataImport.image.repository }}:{{ .Values.jobs.dataImport.image.tag }}"
-          env:
-            - name: API_KEY
-              value: {{ .Values.jobs.dataImport.env.API_KEY }}
-            - name: ENDPOINT
-              value: {{ .Values.jobs.dataImport.env.ENDPOINT }}
+          args:
+            - "import"
+            - "-t"
+            - {{ .Values.jobs.dataImport.apiKey }}
+            - "-h"
+            - {{ .Values.jobs.dataImport.endpoint.host }}
+            - "-p"
+            - {{ .Values.jobs.dataImport.endpoint.port | quote }}
+            - "-j"
+            - "master"
+            - "-j"
+            - "identity"
+            - "-j"
+            - "extra"
           resources:
             {{- toYaml .Values.jobs.dataImport.resources | nindent 12 }}
     {{- if .Values.jobs.dataImport.nodeSelector }}

charts/system/values.yaml

@@ -23,17 +23,18 @@ jobs:
       pullSecrets: []
       pullPolicy: Always
       repository: restorecommerce/data
-      tag: demo-shop-0.1.0
+      tag: demo-shop-v0.0.4
     resources:
       requests:
         cpu: 250m
         memory: 200Mi
     securityContext:
       runAsUser: 1000
       fsGroup: 1000
-    env:
-      API_KEY: FACADE_API_KEY
-      ENDPOINT: http://facade-srv:5000/graphql
+    apiKey: FACADE_API_KEY
+    endpoint:
+      host: facade-srv
+      port: 5000
 
 identity-srv:
   fullnameOverride: identity-srv
@@ -45,6 +46,8 @@ identity-srv:
         value: redis-master
       - name: logger__elasticsearch__clientOpts__node
         value: http://elasticsearch-master:9200
+      - name: authorization__enabled
+        value: "false"
 
 notification-srv:
   fullnameOverride: notification-srv
@@ -65,6 +68,8 @@ access-control-srv:
         value: redis-master
       - name: logger__elasticsearch__clientOpts__node
         value: http://elasticsearch-master:9200
+      - name: authorization__enabled
+        value: "false"
 
 ostorage-srv:
   fullnameOverride: ostorage-srv
@@ -160,6 +165,22 @@ payment-srv:
       - name: logger__elasticsearch__clientOpts__node
         value: http://elasticsearch-master:9200
 
+resource-srv:
+  fullnameOverride: resource-srv
+  env:
+    extras:
+      - name: redis__host
+        value: redis-master
+      - name: authorization__cache__host
+        value: redis-master
+      - name: logger__elasticsearch__clientOpts__node
+        value: http://elasticsearch-master:9200
+      - name: authorization__enabled
+        value: "false"
+
+facade-srv:
+  fullnameOverride: facade-srv
+
 zookeeper:
   fullnameOverride: zookeeper