Change deployment to new 1.20 Kubernetes cluster

Author: vdboor

.dockerignore

@@ -7,19 +7,20 @@
 *.sql.gz
 .cache
 .project
-.idea
+.idea/
 .pydevproject
-.idea/workspace.xml
 .DS_Store
 .git/
 .sass-cache
 .vagrant/
+__pycache__
 dist
 docs
 env
 logs
 src/djangofluent/settings/local.py
 src/node_modules
+web/media
 web/media/cache/
 stats
 Dockerfile

deployment/kustomize/environments/dev/ingress.yml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: djangofluent
@@ -8,6 +8,9 @@ spec:
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: 80
+              service:
+                name: djangofluent
+                port:
+                  number: 80

deployment/kustomize/environments/prd/ingress.yml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: djangofluent
@@ -26,12 +26,15 @@ spec:
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: http
+              service:
+                name: djangofluent
+                port:
+                  number: 80
 ---
 # Leverage nginx-ingress cache for /media/
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: djangofluent-media
@@ -49,12 +52,15 @@ spec:
       http:
         paths:
           - path: /media/
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: http
+              service:
+                name: djangofluent
+                port:
+                  number: 80
 ---
 # Leverage nginx-ingress cache for /static/
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: djangofluent-static
@@ -72,6 +78,9 @@ spec:
       http:
         paths:
           - path: /static/
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: http
+              service:
+                name: djangofluent
+                port:
+                  number: 80

deployment/kustomize/environments/prd/patches.yml

@@ -25,11 +25,11 @@ spec:
           value: "1"
       hostAliases:
         - hostnames: ["pgbouncer-apps.infra"]
-          ip: 10.112.2.12
+          ip: 10.43.242.171
         - hostnames: ["postgres-apps.infra"]
-          ip: 10.112.0.102
+          ip: 10.43.86.136
         - hostnames: ["redis-master.infra"]
-          ip: 10.112.12.219
+          ip: 10.43.26.82
 
 ---
 apiVersion: batch/v1
@@ -59,8 +59,8 @@ spec:
           value: "1"
       hostAliases:
         - hostnames: ["pgbouncer-apps.infra"]
-          ip: 10.112.2.12
+          ip: 10.43.242.171
         - hostnames: ["postgres-apps.infra"]
-          ip: 10.112.0.102
+          ip: 10.43.86.136
         - hostnames: ["redis-master.infra"]
-          ip: 10.112.12.219
+          ip: 10.43.26.82

deployment/kustomize/environments/tst/ingress.yml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: djangofluent
@@ -22,12 +22,15 @@ spec:
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: http
+              service:
+                name: djangofluent
+                port:
+                  number: 80
 ---
 # Extra ingress for paths that should not have auth annotations
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: djangofluent-authexclude
@@ -37,12 +40,15 @@ spec:
       http:
         paths:
           - path: /api/health/
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: http
+              service:
+                name: djangofluent
+                port:
+                  number: 80
 ---
 # Leverage nginx-ingress cache for /media/
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: djangofluent-media
@@ -60,12 +66,15 @@ spec:
       http:
         paths:
           - path: /media/
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: http
+              service:
+                name: djangofluent
+                port:
+                  number: 80
 ---
 # Leverage nginx-ingress cache for /static/
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: djangofluent-static
@@ -83,6 +92,9 @@ spec:
       http:
         paths:
           - path: /static/
+            pathType: Prefix
             backend:
-              serviceName: djangofluent
-              servicePort: http
+              service:
+                name: djangofluent
+                port:
+                  number: 80

deployment/kustomize/environments/tst/patches.yml

@@ -31,11 +31,11 @@ spec:
           value: "1"
       hostAliases:
         - hostnames: ["pgbouncer-apps.infra"]
-          ip: 10.112.2.12
+          ip: 10.43.242.171
         - hostnames: ["postgres-apps.infra"]
-          ip: 10.112.0.102
+          ip: 10.43.86.136
         - hostnames: ["redis-master.infra"]
-          ip: 10.112.12.219
+          ip: 10.43.26.82
 ---
 apiVersion: batch/v1
 kind: Job
@@ -70,8 +70,8 @@ spec:
           value: "1"
       hostAliases:
         - hostnames: ["pgbouncer-apps.infra"]
-          ip: 10.112.2.12
+          ip: 10.43.242.171
         - hostnames: ["postgres-apps.infra"]
-          ip: 10.112.0.102
+          ip: 10.43.86.136
         - hostnames: ["redis-master.infra"]
-          ip: 10.112.12.219
+          ip: 10.43.26.82

skaffold.yml

@@ -0,0 +1,25 @@
+apiVersion: skaffold/v2beta19
+kind: Config
+build:
+  artifacts:
+    - image: djangofluent
+      context: .
+profiles:
+  - name: dev
+    deploy:
+      kubeContext: docker-desktop
+      kustomize:
+        paths:
+          - deployment/kustomize/environments/dev
+  - name: tst
+    deploy:
+      kubeContext: k3os
+      kustomize:
+        paths:
+          - deployment/kustomize/environments/tst
+  - name: prd
+    deploy:
+      kubeContext: k3os
+      kustomize:
+        paths:
+          - deployment/kustomize/environments/prd