Add node selectors and namespace support

templates/default/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app: diffgram-default
   name: diffgram-default
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.defaultService.numReplicas }}
   selector:
@@ -15,6 +15,10 @@ spec:
       labels:
         app: diffgram-default
     spec:
+      {{ if .Values.nodeGroupLabel }}
+      nodeSelector:
+        poolName: {{ .Values.nodeGroupLabel }}
+      {{ end }}
       {{ if eq .Values.diffgramEdition "enterprise"}}
       imagePullSecrets:
       - name: diffgramsecret
@@ -30,7 +34,7 @@ spec:
       {{ end }}
       initContainers:
       - name: check-db-ready
-        image: postgres:9.6.5
+        image: postgres:11
         {{ if eq .Values.dbSettings.dbProvider "local"}}
         command: ['sh', '-c',
                   'until pg_isready -h diffgram-postgres -p 5432;

templates/default/service.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app: diffgram-default
   name: diffgram-default
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - port: 8080

templates/frontend/deployment.yaml

@@ -4,9 +4,10 @@ metadata:
   labels:
     app: frontend
   name: frontend
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.frontendService.numReplicas }}
+
   selector:
     matchLabels:
       app: frontend
@@ -15,6 +16,10 @@ spec:
       labels:
         app: frontend
     spec:
+      {{ if .Values.nodeGroupLabel }}
+      nodeSelector:
+        poolName: {{ .Values.nodeGroupLabel }}
+      {{ end }}
       {{ if eq .Values.diffgramEdition "enterprise"}}
       imagePullSecrets:
       - name: diffgramsecret

templates/frontend/service.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app: frontend
   name: frontend
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - port: 8080

templates/hooks/database_pre_install.yaml

@@ -22,6 +22,10 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name | quote }}
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     spec:
+      {{ if .Values.nodeGroupLabel }}
+      nodeSelector:
+        poolName: {{ .Values.nodeGroupLabel }}
+      {{ end }}
       restartPolicy: Never
       {{ if eq .Values.diffgramEdition "enterprise"}}
       imagePullSecrets:
@@ -36,9 +40,11 @@ spec:
           - key: sa_json
             path: sa_credentials.json
       {{ end }}
+      {{ if eq .Values.dbSettings.dbProvider "local"}}
       - name: postgres-storage
         persistentVolumeClaim:
           claimName: postgres-pv-claim
+      {{ end }}
       containers:
       {{ if eq .Values.diffgramEdition "enterprise"}}
       - image: gcr.io/diffgram-enterprise/default:{{ .Values.diffgramVersion }}
@@ -50,7 +56,7 @@ spec:
         name: pre-upgrade-alembic-hook
       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
         volumeMounts:
-        - name: service-account-credentials-volume
+        - name: service-account-credentials-volume-hook
           mountPath: /etc/gcp
           readOnly: true
       {{ end }}

templates/hooks/database_pre_upgrade.yaml

@@ -27,13 +27,15 @@ spec:
       imagePullSecrets:
       - name: diffgramsecret
       {{ end }}
+      {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
       volumes:
       - name: service-account-credentials-volume-hook
         secret:
           secretName: gcp-service-account-credentials-hook
           items:
           - key: sa_json
             path: sa_credentials.json
+      {{ end }}
       containers:
       {{ if eq .Values.diffgramEdition "enterprise"}}
       - image: gcr.io/diffgram-enterprise/default:{{ .Values.diffgramVersion }}
@@ -43,14 +45,21 @@ spec:
       {{ end }}
         imagePullPolicy: Always
         name: pre-upgrade-alembic-hook
+       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
         volumeMounts:
         - name: service-account-credentials-volume-hook
           mountPath: /etc/gcp
           readOnly: true
+       {{ end }}
         envFrom:
         - configMapRef:
             name: db-migrations-configmap
         - secretRef:
             name:  db-migrations-secret
         # The actual migrations command
-        command: ["sh","-c", "cd shared; export PYTHONPATH=/app; pip install sqlalchemy-utils==0.36.6;python /app/play_and_scripts/scripts/create_database.py;"]
+        command: ["sh","-c", "cd shared; export PYTHONPATH=/app; pip install sqlalchemy-utils==0.36.6;python /app/play_and_scripts/scripts/create_database.py;"]
+
+      {{ if .Values.nodeGroupLabel }}
+      nodeSelector:
+        poolName: {{ .Values.nodeGroupLabel }}
+      {{ end }}

templates/hooks/secret_gcr_db_migrations.yaml

@@ -20,6 +20,6 @@ metadata:
     manager: kubectl
     operation: Update
   name: db-migrations-pull-secret
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 type: kubernetes.io/dockerconfigjson
 {{ end }}

templates/ingress.yaml

@@ -2,11 +2,13 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: diffgram-ingress
+  namespace: {{ .Release.Namespace }}
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/enable-cors: "true"
     cert-manager.io/issuer: "letsencrypt-prod"
+    watch-namespace: {{ .Release.Namespace }}
 #    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 #    nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
     # Limit uploads to 8TB

templates/postgres/deployment.yaml

@@ -5,7 +5,7 @@ apiVersion: "apps/v1"
 kind: "Deployment"
 metadata:
   name: "postgres"
-  namespace: "default"
+  namespace: {{ .Release.Namespace }}"
   labels:
     app: "postgres"
   annotations:
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
       - name: "postgres"
-        image: "postgres:9.6.2"
+        image: "postgres:11"
         env:
         - name: "POSTGRES_DB"
           value: {{ .Values.dbSettings.dbName }}
@@ -44,5 +44,9 @@ spec:
         - name: postgres-storage
           persistentVolumeClaim:
             claimName: postgres-pv-claim
+    {{ if eq .Values.nodeGroupLabel }}
+    nodeSelector:
+      poolName: {{ .Values.nodeGroupLabel }}
+    {{ end }}
 {{ end }}
 {{ end }}

templates/postgres/service.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: diffgram-postgres
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - port: 5432

templates/secret-gcr.yaml

@@ -15,6 +15,6 @@ metadata:
     manager: kubectl
     operation: Update
   name: diffgramsecret
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 type: kubernetes.io/dockerconfigjson
 {{ end }}

templates/walrus/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app: diffgram-walrus
   name: diffgram-walrus
-  namespace: default
+  namespace:
 spec:
   replicas: {{ .Values.walrusService.numReplicas }}
   selector:
@@ -15,6 +15,10 @@ spec:
       labels:
         app: diffgram-walrus
     spec:
+      {{ if .Values.nodeGroupLabel }}
+      nodeSelector:
+        poolName: {{ .Values.nodeGroupLabel }}
+      {{ end }}
       {{ if eq .Values.diffgramEdition "enterprise"}}
       imagePullSecrets:
       - name: diffgramsecret
@@ -32,7 +36,7 @@ spec:
         emptyDir: {}
       initContainers:
       - name: check-db-ready
-        image: postgres:9.6.5
+        image: postgres:11
         {{ if eq .Values.dbSettings.dbProvider "local"}}
         command: ['sh', '-c',
                   'until pg_isready -h diffgram-postgres -p 5432;

templates/walrus/service.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app: diffgram-walrus
   name: diffgram-walrus
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - port: 8080

values.yaml

@@ -71,33 +71,35 @@ imagePullCredentials:
   # The service account with permissions to pull from the GCR Repository. [Should be Provided by Diffgram Team.]
   gcrCredentials: provided_by_diffgram_team
 
+nodeGroupLabel: null
+
 # The service for API calls.
 # This are minimal defaults. Please feel free to change them as you start having more usage
 defaultService:
-  numReplicas: 1
+  numReplicas: 2
   requests:
     cpu: "2.0"
-    memory: "2G"
+    memory: "4G"
   limits:
     cpu: "2.0"
-    memory: "2G"
+    memory: "4G"
 # The service for the UI frontend.
 # This are minimal defaults. Please feel free to change them as you start having more usage
 frontendService:
   numReplicas: 1
   requests:
-    cpu: "1.0"
+    cpu: "2.0"
     memory: "2G"
   limits:
-    cpu: "1.0"
+    cpu: "2.0"
     memory: "2G"
 # The service for video processing. This is where the heavy processing takes place.
 # This are minimal defaults. Please feel free to change them as you start having more usage
 walrusService:
-  numReplicas: 1
+  numReplicas: 2
   requests:
     cpu: "4.0"
-    memory: "16G"
+    memory: "14G"
   limits:
-    cpu: "4.0"
-    memory: "16G"
+    cpu: "8.0"
+    memory: "32G"