Merge pull request #280 from ThinkDeepTech/hm/helm

haydenmcp · web-flow · commit 79c7571019df · 2022-02-16T11:08:21.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/packages/deep-microservice-analysis/templates/secret.yaml b/packages/deep-microservice-analysis/templates/secret.yaml
@@ -5,5 +5,6 @@ metadata:
 data:
     PREDECOS_KAFKA_HOST: {{ printf "%s" (required "A valid Kafka host is required." .Values.kafka.host) | b64enc | quote}}
     PREDECOS_KAFKA_PORT: {{ printf "%d" (required "A valid kafka port is required." .Values.kafka.port) | b64enc }}
+    # TODO
     # PREDECOS_MONGODB_CONNECTION_STRING: {{ printf "mongodb://%s:%s@%s-mongodb.%s.svc.cluster.local" (required "The user name for MongoDB is required" .Values.mongodb.auth.rootUser) (required "The user password for MongoDB is required" .Values.mongodb.auth.rootPassword) (.Release.Name) (.Values.namespace) | b64enc | quote}}
     PREDECOS_MONGODB_CONNECTION_STRING: {{ printf "mongodb://%s-mongodb.%s.svc.cluster.local" (.Release.Name) (.Values.namespace) | b64enc | quote}}
diff --git a/packages/deep-microservice-collection/Chart.lock b/packages/deep-microservice-collection/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: mongodb
+  repository: https://charts.bitnami.com/bitnami
+  version: 11.0.3
+digest: sha256:1c7c1831a71c2934908d87598cba3e0b77232f6e34730f93d868022c0272c436
+generated: "2022-02-16T09:19:54.454296101-05:00"
diff --git a/packages/deep-microservice-collection/Chart.yaml b/packages/deep-microservice-collection/Chart.yaml
@@ -0,0 +1,10 @@
+apiVersion: "v2"
+appVersion: "4.4.12"
+dependencies:
+  - name: "mongodb"
+    repository: "https://charts.bitnami.com/bitnami"
+    tags:
+      - "bitnami-mongodb"
+    version: "11.0.3"
+name: "deep-microservice-collection"
+version: "0.0.8"
diff --git a/packages/deep-microservice-collection/Dockerfile b/packages/deep-microservice-collection/Dockerfile
@@ -1,17 +1,5 @@
 FROM ubuntu:20.04
 
-ARG PREDECOS_KAFKA_HOST
-ARG PREDECOS_KAFKA_PORT
-ARG PREDECOS_MONGODB_CONNECTION_STRING
-ARG PREDECOS_TWITTER_BEARER
-ARG NODE_ENV
-
-ENV PREDECOS_KAFKA_HOST=$PREDECOS_KAFKA_HOST
-ENV PREDECOS_KAFKA_PORT=$PREDECOS_KAFKA_PORT
-ENV PREDECOS_MONGODB_CONNECTION_STRING=$PREDECOS_MONGODB_CONNECTION_STRING
-ENV PREDECOS_TWITTER_BEARER=$PREDECOS_TWITTER_BEARER
-ENV NODE_ENV=$NODE_ENV
-
 WORKDIR /usr/src/app
 
 RUN apt-get update
diff --git a/packages/deep-microservice-collection/k8s/mongodb-deployment.yml b/packages/deep-microservice-collection/k8s/mongodb-deployment.yml
diff --git a/packages/deep-microservice-collection/k8s/mongodb-service.yml b/packages/deep-microservice-collection/k8s/mongodb-service.yml
diff --git a/packages/deep-microservice-collection/templates/deployment.yml b/packages/deep-microservice-collection/templates/deployment.yml
@@ -0,0 +1,29 @@
+apiVersion: "apps/v1"
+kind: "Deployment"
+metadata:
+  name: {{ printf "%s-deployment" .Release.Name | quote }}
+  labels:
+    app: "deep-microservice-collection"
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      app: "deep-microservice-collection"
+  template:
+    metadata:
+      labels:
+        app: "deep-microservice-collection"
+    spec:
+      containers:
+      - name: "deep-microservice-collection"
+        image: "thinkdeeptech/deep-microservice-collection:latest"
+        envFrom:
+        - configMapRef:
+            name: {{ printf "%s-config-map" .Release.Name | quote}}
+        - secretRef:
+            name: {{ printf "%s-secrets" .Release.Name | quote}}
+        ports:
+        - containerPort: 4002
+        imagePullPolicy: "Always"
+      imagePullSecrets:
+        - name: "docker-secret"
diff --git a/packages/deep-microservice-collection/templates/environment.yaml b/packages/deep-microservice-collection/templates/environment.yaml
@@ -0,0 +1,6 @@
+apiVersion: "v1"
+kind: "ConfigMap"
+metadata:
+    name: {{ printf "%s-config-map" .Release.Name | quote}}
+data:
+    NODE_ENV: {{ required "A valid node environment is required" .Values.nodeEnv | quote}}
diff --git a/packages/deep-microservice-collection/templates/secret.yaml b/packages/deep-microservice-collection/templates/secret.yaml
@@ -0,0 +1,11 @@
+apiVersion: "v1"
+kind: "Secret"
+metadata:
+    name: {{ printf "%s-secrets" .Release.Name | quote }}
+data:
+    PREDECOS_KAFKA_HOST: {{ printf "%s" (required "A valid Kafka host is required." .Values.kafka.host) | b64enc | quote}}
+    PREDECOS_KAFKA_PORT: {{ printf "%d" (required "A valid kafka port is required." .Values.kafka.port) | b64enc }}
+    # TODO
+    # PREDECOS_MONGODB_CONNECTION_STRING: {{ printf "mongodb://%s:%s@%s-mongodb.%s.svc.cluster.local" (required "The user name for MongoDB is required" .Values.mongodb.auth.rootUser) (required "The user password for MongoDB is required" .Values.mongodb.auth.rootPassword) (.Release.Name) (.Values.namespace) | b64enc | quote}}
+    PREDECOS_MONGODB_CONNECTION_STRING: {{ printf "mongodb://%s-mongodb.%s.svc.cluster.local" (.Release.Name) (.Values.namespace) | b64enc | quote}}
+    PREDECOS_TWITTER_BEARER: {{ printf "%s" (required "A twitter api bearer token is required." .Values.twitter.bearer) | b64enc | quote }}
diff --git a/packages/deep-microservice-collection/templates/service.yml b/packages/deep-microservice-collection/templates/service.yml
@@ -0,0 +1,10 @@
+# apiVersion: "v1"
+# kind: "Service"
+# metadata:
+#   name: {{ printf "%s-service" .Release.Name | quote }}
+# spec:
+#   selector:
+#     app: deep-microservice-collection
+#   ports:
+#     - protocol: TCP
+#       port: 4002
diff --git a/packages/deep-microservice-collection/values.yaml b/packages/deep-microservice-collection/values.yaml
@@ -0,0 +1,18 @@
+  namespace: "default"
+
+  replicas: 1
+
+  nodeEnv: "development" # TODO: Default to production
+
+  mongodb:
+    auth:
+      enabled: false
+      rootUser: "root"
+      rootPassword: ""
+
+  kafka:
+    host: ""
+    port: 9092
+
+  twitter:
+    bearer: ""
diff --git a/packages/deep-microservice-configuration/Chart.yaml b/packages/deep-microservice-configuration/Chart.yaml
@@ -0,0 +1,10 @@
+apiVersion: "v2"
+appVersion: "4.4.12"
+dependencies:
+  - name: "mongodb"
+    repository: "https://charts.bitnami.com/bitnami"
+    tags:
+      - "bitnami-mongodb"
+    version: "11.0.3"
+name: "deep-microservice-configuration"
+version: "0.0.8"
diff --git a/packages/deep-microservice-configuration/Dockerfile b/packages/deep-microservice-configuration/Dockerfile
@@ -1,11 +1,5 @@
 FROM ubuntu:20.04
 
-ARG PREDECOS_MONGODB_CONNECTION_STRING
-ARG NODE_ENV
-
-ENV PREDECOS_MONGODB_CONNECTION_STRING=$PREDECOS_MONGODB_CONNECTION_STRING
-ENV NODE_ENV=$NODE_ENV
-
 WORKDIR /usr/src/app
 
 RUN apt-get update
diff --git a/packages/deep-microservice-configuration/templates/deployment.yml b/packages/deep-microservice-configuration/templates/deployment.yml
@@ -0,0 +1,30 @@
+apiVersion: "apps/v1"
+kind: "Deployment"
+metadata:
+  name: {{ printf "%s-deployment" .Release.Name | quote}}
+  labels:
+    app: "deep-microservice-configuration"
+    app.kubernetes.io/managed-by: "helm"
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      app: "deep-microservice-configuration"
+  template:
+    metadata:
+      labels:
+        app: "deep-microservice-configuration"
+    spec:
+      containers:
+      - name: "deep-microservice-configuration"
+        image: "thinkdeeptech/deep-microservice-configuration:latest"
+        envFrom:
+        - configMapRef:
+            name: {{ printf "%s-config-map" .Release.Name | quote}}
+        - secretRef:
+            name: {{ printf "%s-secrets" .Release.Name | quote}}
+        ports:
+        - containerPort: 4003
+        imagePullPolicy: "Always"
+      imagePullSecrets:
+        - name: "docker-secret"
diff --git a/packages/deep-microservice-configuration/templates/environment.yaml b/packages/deep-microservice-configuration/templates/environment.yaml
@@ -0,0 +1,6 @@
+apiVersion: "v1"
+kind: "ConfigMap"
+metadata:
+    name: {{ printf "%s-config-map" .Release.Name | quote}}
+data:
+    NODE_ENV: {{ required "A valid node environment is required" .Values.nodeEnv | quote}}
diff --git a/packages/deep-microservice-configuration/templates/secret.yaml b/packages/deep-microservice-configuration/templates/secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: "v1"
+kind: "Secret"
+metadata:
+    name: {{ printf "%s-secrets" .Release.Name | quote }}
+data:
+    # TODO
+    # PREDECOS_MONGODB_CONNECTION_STRING: {{ printf "mongodb://%s:%s@%s-mongodb.%s.svc.cluster.local" (required "The user name for MongoDB is required" .Values.mongodb.auth.rootUser) (required "The user password for MongoDB is required" .Values.mongodb.auth.rootPassword) (.Release.Name) (.Values.namespace) | b64enc | quote}}
+    PREDECOS_MONGODB_CONNECTION_STRING: {{ printf "mongodb://%s-mongodb.%s.svc.cluster.local" (.Release.Name) (.Values.namespace) | b64enc | quote}}
diff --git a/packages/deep-microservice-configuration/templates/service.yml b/packages/deep-microservice-configuration/templates/service.yml
@@ -0,0 +1,11 @@
+# TODO: This needs to be reintroduced when DNS is added.
+# apiVersion: "v1"
+# kind: "Service"
+# metadata:
+#   name: {{ printf "%s-service" .Release.Name | quote}}
+# spec:
+#   selector:
+#     app: "deep-microservice-configuration"
+#   ports:
+#     - protocol: "TCP"
+#       port: 4003
diff --git a/packages/deep-microservice-configuration/values.yaml b/packages/deep-microservice-configuration/values.yaml
@@ -0,0 +1,11 @@
+  namespace: "default"
+
+  replicas: 1
+
+  nodeEnv: "development" # TODO: Default to production
+
+  mongodb:
+    auth:
+      enabled: false
+      # rootUser: "root"
+      # rootPassword: ""
diff --git a/packages/deep-microservice-gateway/Chart.yaml b/packages/deep-microservice-gateway/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: "v2"
+appVersion: "4.4.12"
+name: "deep-microservice-gateway"
+version: "0.0.8"
diff --git a/packages/deep-microservice-gateway/Dockerfile b/packages/deep-microservice-gateway/Dockerfile
@@ -1,21 +1,5 @@
 FROM ubuntu:20.04
 
-ARG PREDECOS_AUTH_AUDIENCE
-ARG PREDECOS_AUTH_JWKS_URI
-ARG PREDECOS_AUTH_ISSUER
-ARG PREDECOS_MICROSERVICE_ANALYSIS_URL
-ARG PREDECOS_MICROSERVICE_COLLECTION_URL
-ARG PREDECOS_MICROSERVICE_CONFIGURATION_URL
-ARG NODE_ENV
-
-ENV PREDECOS_AUTH_AUDIENCE=$PREDECOS_AUTH_AUDIENCE
-ENV PREDECOS_AUTH_JWKS_URI=$PREDECOS_AUTH_JWKS_URI
-ENV PREDECOS_AUTH_ISSUER=$PREDECOS_AUTH_ISSUER
-ENV PREDECOS_MICROSERVICE_ANALYSIS_URL=$PREDECOS_MICROSERVICE_ANALYSIS_URL
-ENV PREDECOS_MICROSERVICE_COLLECTION_URL=$PREDECOS_MICROSERVICE_COLLECTION_URL
-ENV PREDECOS_MICROSERVICE_CONFIGURATION_URL=$PREDECOS_MICROSERVICE_CONFIGURATION_URL
-ENV NODE_ENV=$NODE_ENV
-
 WORKDIR /usr/src/app
 
 RUN apt-get update
diff --git a/packages/deep-microservice-gateway/templates/deployment.yml b/packages/deep-microservice-gateway/templates/deployment.yml
@@ -0,0 +1,30 @@
+apiVersion: "apps/v1"
+kind: "Deployment"
+metadata:
+  name: {{ printf "%s-deployment" .Release.Name | quote}}
+  labels:
+    app: "deep-microservice-gateway"
+    app.kubernetes.io/managed-by: "helm"
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      app: "deep-microservice-gateway"
+  template:
+    metadata:
+      labels:
+        app: "deep-microservice-gateway"
+    spec:
+      containers:
+      - name: "deep-microservice-gateway"
+        image: "thinkdeeptech/deep-microservice-gateway:latest"
+        envFrom:
+        - configMapRef:
+            name: {{ printf "%s-config-map" .Release.Name | quote}}
+        - secretRef:
+            name: {{ printf "%s-secrets" .Release.Name | quote}}
+        ports:
+        - containerPort: 4000
+        imagePullPolicy: "Always"
+      imagePullSecrets:
+        - name: "docker-secret"
diff --git a/packages/deep-microservice-gateway/templates/environment.yaml b/packages/deep-microservice-gateway/templates/environment.yaml
@@ -0,0 +1,6 @@
+apiVersion: "v1"
+kind: "ConfigMap"
+metadata:
+    name: {{ printf "%s-config-map" .Release.Name | quote}}
+data:
+    NODE_ENV: {{ required "A valid node environment is required" .Values.nodeEnv | quote}}
diff --git a/packages/deep-microservice-gateway/templates/secret.yaml b/packages/deep-microservice-gateway/templates/secret.yaml
@@ -0,0 +1,11 @@
+apiVersion: "v1"
+kind: "Secret"
+metadata:
+    name: {{ printf "%s-secrets" .Release.Name | quote }}
+data:
+    PREDECOS_AUTH_AUDIENCE: {{ printf "%s" ( required "The auth audience is required." .Values.auth.audience) | b64enc | quote }}
+    PREDECOS_AUTH_JWKS_URI: {{ printf "%s" ( required "The auth jwks uri is required." .Values.auth.jwksUri) | b64enc | quote }}
+    PREDECOS_AUTH_ISSUER: {{ printf "%s" ( required "The auth issuer is required" .Values.auth.issuer) | b64enc | quote }}
+    PREDECOS_MICROSERVICE_ANALYSIS_URL: {{ printf "%s" (required "A url pointing to the analysis microservice is required." .Values.microservice.analysis.url) | b64enc | quote }}
+    PREDECOS_MICROSERVICE_COLLECTION_URL: {{ printf "%s" (required "A url pointing to the collection microservice is required." .Values.microservice.collection.url) | b64enc | quote }}
+    PREDECOS_MICROSERVICE_CONFIGURATION_URL: {{ printf "%s" (required "A url pointing to the configuration microservice is required." .Values.microservice.configuration.url) | b64enc | quote }}
diff --git a/packages/deep-microservice-gateway/templates/service.yml b/packages/deep-microservice-gateway/templates/service.yml
@@ -0,0 +1,22 @@
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: {{ printf "%s-service" .Release.Name | quote }}
+#   annotations:
+#     # No TLS port annotation needed since 443 is assumed for HTTPS when another TLS option annotation is given.
+#     service.beta.kubernetes.io/do-loadbalancer-certificate-id: "12cba529-a0a4-4c85-a928-0d9154040f91"
+#     service.beta.kubernetes.io/do-loadbalancer-protocol: "http"
+#     service.beta.kubernetes.io/do-loadbalancer-algorithm: "round_robin"
+#     service.beta.kubernetes.io/do-loadbalancer-tls-ports: "443"
+# spec:
+#   type: LoadBalancer
+#   selector:
+#     app: deep-microservice-gateway
+#   ports:
+#     - name: http
+#       protocol: TCP
+#       port: 4000
+#     - name: https
+#       protocol: TCP
+#       port: 443
+#       targetPort: 4000
diff --git a/packages/deep-microservice-gateway/values.yaml b/packages/deep-microservice-gateway/values.yaml
@@ -0,0 +1,18 @@
+  namespace: "default"
+
+  replicas: 1
+
+  nodeEnv: "development" # TODO: Default to production
+
+  auth:
+    audience: ""
+    jwksUri: ""
+    issuer: ""
+
+  microservice:
+    analysis:
+      url: ""
+    collection:
+      url: ""
+    configuration:
+      url: ""
diff --git a/packages/deep-microservice-subscription/Chart.yaml b/packages/deep-microservice-subscription/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: "v2"
+appVersion: "4.4.12"
+name: "deep-microservice-subscription"
+version: "0.0.8"
diff --git a/packages/deep-microservice-subscription/Dockerfile b/packages/deep-microservice-subscription/Dockerfile
diff --git a/packages/deep-microservice-subscription/templates/deployment.yml b/packages/deep-microservice-subscription/templates/deployment.yml
diff --git a/packages/deep-microservice-subscription/templates/environment.yaml b/packages/deep-microservice-subscription/templates/environment.yaml
diff --git a/packages/deep-microservice-subscription/templates/secret.yaml b/packages/deep-microservice-subscription/templates/secret.yaml
diff --git a/packages/deep-microservice-subscription/templates/service.yml b/packages/deep-microservice-subscription/templates/service.yml
diff --git a/packages/deep-microservice-subscription/values.yaml b/packages/deep-microservice-subscription/values.yaml
