[docker] Adding HTTPS & affinity working in replica set & standalone case

iartem · iartem · commit 82facc262c37 · 2019-09-24T18:39:38.000+03:00
diff --git a/bin/docker/k8s/countly-api-service.yaml b/bin/docker/k8s/countly-api-service.yaml
diff --git a/bin/docker/k8s/countly-api.yaml b/bin/docker/k8s/countly-api.yaml
@@ -1,3 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: countly-api
+spec:
+  ports:
+  - port: 3001
+    protocol: TCP
+    targetPort: 3001
+  selector:
+    app: countly-api
+  type: NodePort
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -16,10 +29,18 @@ spec:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - countly-api
+                - mongo           # in case you don't use replica set, give your mongodb pod label app=mongo to ensure it's not on the same node with API
             topologyKey: "kubernetes.io/hostname"
       containers:
       - name: countly-api
         image: countly/api:19.08.1
+#        image: gcr.io/countly-01/api:19.08.1     # Enterprise Edition
+        imagePullPolicy: Always
         ports:
         - containerPort: 3001
         readinessProbe:
@@ -32,9 +53,10 @@ spec:
         env:
           - name: COUNTLY_PLUGINS
             value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,plugin-upload,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding"
+            # Enterprise Edition: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,drill,funnels,concurrent_users,retention_segments,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,block,restrict,users,geo,star-rating,slipping-away-users,compare,server-stats,dashboards,assistant,flows,dbviewer,cohorts,crash_symbolication,crashes-jira,groups,white-labeling,plugin-upload,alerts,times-of-day,compliance-hub,onboarding,remote-config,formulas,ab-testing"
           - name: COUNTLY_CONFIG_API_FILESTORAGE
             value: "gridfs"
           - name: COUNTLY_CONFIG_API_MONGODB
-            value: "mongodb://db-mongodb-replicaset-0.db-mongodb-replicaset:27017,db-mongodb-replicaset-1.db-mongodb-replicaset:27017,db-mongodb-replicaset-2.db-mongodb-replicaset:27017/countly?replicaSet=rs0"
+            value: "mongodb://mongo-mongodb-replicaset-0.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-1.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-2.mongo-mongodb-replicaset:27017/countly?replicaSet=rs0"
           - name: COUNTLY_CONFIG_FRONTEND_MONGODB
-            value: "mongodb://db-mongodb-replicaset-0.db-mongodb-replicaset:27017,db-mongodb-replicaset-1.db-mongodb-replicaset:27017,db-mongodb-replicaset-2.db-mongodb-replicaset:27017/countly?replicaSet=rs0"
+            value: "mongodb://mongo-mongodb-replicaset-0.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-1.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-2.mongo-mongodb-replicaset:27017/countly?replicaSet=rs0"
diff --git a/bin/docker/k8s/countly-frontend-service.yaml b/bin/docker/k8s/countly-frontend-service.yaml
diff --git a/bin/docker/k8s/countly-frontend.yaml b/bin/docker/k8s/countly-frontend.yaml
@@ -1,3 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: countly-frontend
+spec:
+  ports:
+  - port: 6001
+    protocol: TCP
+    targetPort: 6001
+  selector:
+    app: countly-frontend
+  type: NodePort
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -12,9 +25,22 @@ spec:
       labels:
         app: countly-frontend
     spec:
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - mongo
+                - mongodb-replicaset
+            topologyKey: "kubernetes.io/hostname"
       containers:
       - name: countly-frontend
-        image: countly/frontend:19.08.1
+        image: countly/api:19.08.1
+#        image: gcr.io/countly-01/frontend:19.08.1     # Enterprise Edition
+        imagePullPolicy: Always
         ports:
         - containerPort: 6001
         readinessProbe:
@@ -26,9 +52,10 @@ spec:
         env:
           - name: COUNTLY_PLUGINS
             value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,plugin-upload,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding"
+            # Enterprise Edition: value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,drill,funnels,concurrent_users,retention_segments,revenue,logger,systemlogs,errorlogs,populator,reports,crashes,push,block,restrict,users,geo,star-rating,slipping-away-users,compare,server-stats,dashboards,assistant,flows,dbviewer,cohorts,crash_symbolication,crashes-jira,groups,white-labeling,plugin-upload,alerts,times-of-day,compliance-hub,onboarding,remote-config,formulas,ab-testing"
           - name: COUNTLY_CONFIG_API_FILESTORAGE
             value: "gridfs"
           - name: COUNTLY_CONFIG_API_MONGODB
-            value: "mongodb://db-mongodb-replicaset-0.db-mongodb-replicaset:27017,db-mongodb-replicaset-1.db-mongodb-replicaset:27017,db-mongodb-replicaset-2.db-mongodb-replicaset:27017/countly?replicaSet=rs0"
+            value: "mongodb://mongo-mongodb-replicaset-0.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-1.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-2.mongo-mongodb-replicaset:27017/countly?replicaSet=rs0"
           - name: COUNTLY_CONFIG_FRONTEND_MONGODB
-            value: "mongodb://db-mongodb-replicaset-0.db-mongodb-replicaset:27017,db-mongodb-replicaset-1.db-mongodb-replicaset:27017,db-mongodb-replicaset-2.db-mongodb-replicaset:27017/countly?replicaSet=rs0"
+            value: "mongodb://mongo-mongodb-replicaset-0.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-1.mongo-mongodb-replicaset:27017,mongo-mongodb-replicaset-2.mongo-mongodb-replicaset:27017/countly?replicaSet=rs0"
diff --git a/bin/docker/k8s/countly-ingress-gce.yaml b/bin/docker/k8s/countly-ingress-gce.yaml
@@ -1,3 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: countly-tls
+data:
+  tls.crt: YOUR_SSL_CERT_IN_BASE64      # cat cert.crt | base64
+  tls.key: YOUR_SSL_KEY_IN_BASE64       # cat cert.key | base64
+type: kubernetes.io/tls
+---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -6,6 +15,10 @@ metadata:
     nginx.ingress.kubernetes.io/rewrite-target: /
     kubernetes.io/ingress.global-static-ip-name: "countly-static-ip"
 spec:
+  tls:
+  - hosts:
+    - YOUR_HOSTNAME                     # countly.example.com
+    secretName: countly-tls
   rules:
   - http:
       paths:
diff --git a/bin/docker/k8s/countly-ingress.yaml b/bin/docker/k8s/countly-ingress.yaml
@@ -1,10 +1,23 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: countly-tls
+data:
+  tls.crt: YOUR_SSL_CERT_IN_BASE64      # cat cert.crt | base64
+  tls.key: YOUR_SSL_KEY_IN_BASE64       # cat cert.key | base64
+type: kubernetes.io/tls
+---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: countly-ingress
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
+  tls:
+  - hosts:
+    - YOUR_HOSTNAME                     # countly.example.com
+    secretName: countly-tls
   rules:
   - http:
       paths:
diff --git a/bin/docker/k8s/gce-cluster-init.sh b/bin/docker/k8s/gce-cluster-init.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 # ---------------------------------------------------------------------------------------------------
 # -------------------------- IGNORE IF YOU HAVE ALREADY SET UP KUBECTL ------------------------------
 # ---------------------------------------------------------------------------------------------------
@@ -41,17 +40,15 @@ kubectl config set-context --current --namespace=countly
 
 # Install MongoDB
 kubectl apply -f mongo/storage-class.yaml
-helm install --name db -f mongo/values.yaml stable/mongodb-replicaset
+helm install --name mongo -f mongo/values.yaml stable/mongodb-replicaset
 
 ## Wait ~ 3 minutes until all 3 replica set pods spin up
 kubectl get po
 
 
 # Install Countly deployments & services
 kubectl apply -f countly-frontend.yaml
-kubectl apply -f countly-frontend-service.yaml
 kubectl apply -f countly-api.yaml
-kubectl apply -f countly-api-service.yaml
 
 # Install Countly ingress
 gcloud compute addresses create countly-static-ip --global
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
 
   countly-api:
     image: 'countly/api:19.08.1'
+    # Enterprise Edition: image: 'gcr.io/countly-01/api:19.08.1'
     environment:
       - COUNTLY_CONFIG_API_MONGODB_HOST=mongodb
       - COUNTLY_CONFIG_API_MONGODB_USERNAME=${MONGODB_USERNAME}
@@ -42,6 +43,7 @@ services:
 
   countly-frontend:
     image: 'countly/frontend:19.08.1'
+    # Enterprise Edition: image: 'gcr.io/countly-01/api:19.08.1'
     environment:
       - COUNTLY_CONFIG_API_MONGODB_HOST=mongodb
       - COUNTLY_CONFIG_API_MONGODB_USERNAME=${MONGODB_USERNAME}
@@ -69,7 +71,7 @@ services:
   nginx:
     image: 'bitnami/nginx'
     ports:
-      - '8080:8080'
+      - '80:8080'
     volumes:
       - './bin/docker/nginx.server.conf:/opt/bitnami/nginx/conf/server_blocks/countly.conf:ro'
     networks:
