Added cache data PVC to UAT overlays.

dbca-wa · Jan 11, 2024 · acf1deb · acf1deb
1 parent 21dcff3
commit acf1deb
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ config.yaml
 mapproxy.yaml
 .python-version
 __pycache__/
+cache_data/
diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: mapproxy-deployment
 spec:
-  replicas: 2
+  replicas: 1
   strategy:
     type: RollingUpdate
   template:
@@ -17,18 +17,28 @@ spec:
           value: "Australia/Perth"
         resources:
           requests:
-            memory: "64Mi"
+            memory: "128Mi"
             cpu: "10m"
           limits:
-            memory: "4096Mi"
+            memory: "2Gi"
             cpu: "1000m"
-        livenessProbe:
+        startupProbe:
           httpGet:
             path: /demo/
             port: 8080
             scheme: HTTP
           initialDelaySeconds: 5
-          periodSeconds: 3
+          periodSeconds: 5
+          failureThreshold: 3
+          successThreshold: 1
+          timeoutSeconds: 3
+        livenessProbe:
+          httpGet:
+            path: /demo/
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 0
+          periodSeconds: 15
           failureThreshold: 3
           successThreshold: 1
           timeoutSeconds: 3
@@ -37,8 +47,8 @@ spec:
             path: /demo/
             port: 8080
             scheme: HTTP
-          initialDelaySeconds: 5
-          periodSeconds: 3
+          initialDelaySeconds: 0
+          periodSeconds: 15
           failureThreshold: 3
           successThreshold: 1
           timeoutSeconds: 3

diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml
@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - deployment.yaml
   - service.yaml
diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
@@ -13,14 +13,30 @@ spec:
       labels:
         app: mapproxy-uat
     spec:
+      initContainers:
+      - name: chown-pvc
+        image: busybox
+        command:
+          - /bin/chown
+          - -R
+          - "10001:10001"
+          - /cache_data
+        volumeMounts:
+          - mountPath: /cache_data
+            name: mapproxy-cache
       containers:
       - name: mapproxy
         volumeMounts:
-        - mountPath: /app/config
-          name: mapproxy-configmap
+          - mountPath: /app/config
+            name: mapproxy-configmap
+          - mountPath: /cache_data
+            name: mapproxy-cache
       volumes:
-      - configMap:
-          name: mapproxy-configmap-uat
-          defaultMode: 292
-          optional: false
-        name: mapproxy-configmap
+        - name: mapproxy-configmap
+          configMap:
+            name: mapproxy-configmap-uat
+            defaultMode: 292
+            optional: false
+        - name: mapproxy-cache
+          persistentVolumeClaim:
+            claimName: mapproxy-cache-uat
diff --git a/kustomize/overlays/uat/kustomization.yaml b/kustomize/overlays/uat/kustomization.yaml
@@ -5,6 +5,7 @@ resources:
   - ../../base
   - ingress.yaml
   - pdb.yaml
+  - pvc.yaml
 labels:
   - includeSelectors: true
     pairs:

diff --git a/kustomize/overlays/uat/pvc.yaml b/kustomize/overlays/uat/pvc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mapproxy-cache
+spec:
+  storageClassName: managed-csi-retain
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 4Gi