Refactor Helm chart and update deployment scripts

Deleted obsolete Helm chart templates and configuration files to streamline deployment. Renamed and relocated remaining template files for better organization. Updated build script to use Helm for package building and deployment to improve efficiency.

.gitignore

@@ -19,6 +19,15 @@ pytest.ini
 /media/
 /opal/env.*
 
+
 **/__pycache__/
-/build/yaml/secrets/omb_secrets.yaml
-/build/yaml/secrets/dan_secrets.yaml
+
+/build/env_settings/*
+/build/opal/omb_values.yaml
+/build/opal/values.yaml
+/build/helm_output.yaml
+/build/opal.yaml
+/build/opal-0.2.1.tgz
+/build/opal-0.2.2.tgz
+/build/opal-0.2.3.tgz
+/build/opal-0.2.4.tgz

build/build.sh

@@ -8,6 +8,7 @@ docker push 192.168.42.100:5050/opal-webapp
 docker build -t 192.168.42.100:5050/opal-db -f Dockerfile_db .
 docker push 192.168.42.100:5050/opal-db
 
-kubectl apply -f yaml/app/
-kubectl apply -f yaml/db/
-kubectl apply -f yaml/nginx/
+helm package ./opal/ --app-version $(cat ../version.txt)
+
+#helm install opal opal-$(cat opal/Chart.yaml| grep version: | cut -d' ' -f2).tgz --atomic --create-namespace --debug
+helm template opal opal-$(cat opal/Chart.yaml| grep version: | cut -d' ' -f2).tgz > helm_output.yaml

build/helm-chart/Chart.yaml → build/opal/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.2.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

build/helm-chart/yaml/app/opal-webapp-config-map.yaml → build/opal/omb_values.yaml

@@ -1,7 +1,8 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-      name: opal-webapp-config
+namespace: opal
+repo:
+    webapp: 192.168.42.100:5050/opal-webapp:latest
+    db: 192.168.42.100:5050/opal-db:latest
+    nginx: nginx:1.25
 data:
   ENVIRONMENT: prod
   DEBUG: "False"
@@ -24,3 +25,10 @@ data:
   DB_NAME: opal
   LOG_FILE: /usr/src/logs/debug.log
   ENABLE_DJANGO_AUTH: "False"
+secret:
+    db:
+        POSTGRES_PASSWORD: Uk9PVF9EQl9QQVNTV09SRAo= #ROOT_DB_PASSWORD
+        POSTGRES_OPAL_PASSWORD: Uk9PVF9EQl9QQVNTV09SRAo= #OPAL_USER_DB_PASSWORD
+    #tls:
+    #  tls.crt: TLS_CERT
+    #  tls.key: TLS_PRIVATE_KEY

build/helm-chart/yaml/app/opal-webapp-service.yaml → build/opal/templates/app-opal-service.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: opal-webapp-service
-  namespace: {{ .Values.namespace | quote }}
 spec:
   ports:
     - name: http

build/helm-chart/yaml/app/opal-webapp.yaml → build/opal/templates/app-opal.yaml

@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: opal-webapp
-  namespace: {{ .Values.namespace | quote }}
   labels:
     app: opal-webapp
 spec:
@@ -23,13 +22,6 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
         - name: harbor
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: node-role.kubernetes.io/control-plane
-                operator: DoesNotExist
       containers:
         - name: opal-webapp
           image: {{ .Values.repo.webapp }}
@@ -54,7 +46,7 @@ spec:
               name: staticfiles
           envFrom:
             - configMapRef:
-                name: opal-webapp-config
+                name: opal-config
           env:
               - name: DB_PASSWORD
                 valueFrom:

build/helm-chart/yaml/app/pvc-app.yaml → build/opal/templates/app-pvc.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: staticfiles-pvc
-  namespace: {{ .Values.namespace | quote }}
 spec:
   storageClassName: manual
   accessModes:

build/helm-chart/yaml/db/opal-db-service.yaml → build/opal/templates/db-opal-service.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: opal-postgres-db
-  namespace: {{ .Values.namespace | quote }}
 spec:
   ports:
     - name: postgres

build/helm-chart/yaml/db/opal-db.yaml → build/opal/templates/db-opal.yaml

@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: opal-postgres-db
-  namespace: {{ .Values.namespace | quote }}
   labels:
     app: opal-postgres-db
 spec:
@@ -23,13 +22,6 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
         - name: harbor
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-role.kubernetes.io/control-plane
-                  operator: DoesNotExist
       containers:
         - name: opal-postgres-db
           image: {{ .Values.repo.db }}

build/helm-chart/yaml/db/pvc-db.yaml → build/opal/templates/db-pvc.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: postgres-pvc
-  namespace: {{ .Values.namespace | quote }}
 spec:
   storageClassName: manual
   accessModes:

build/helm-chart/yaml/nginx/nginx-cm.yaml → build/opal/templates/nginx-cm.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-cm
-  namespace: {{ .Values.namespace | quote }}
 data:
   default.conf: |
     server { 

build/helm-chart/yaml/nginx/nginx-staticfiles-service.yaml → build/opal/templates/nginx-staticfiles-service.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: nginx-service
-  namespace: {{ .Values.namespace | quote }}
 spec:
   ports:
   - name: http

build/helm-chart/yaml/nginx/nginx-staticfiles.yaml → build/opal/templates/nginx-staticfiles.yaml

@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-static
-  namespace: {{ .Values.namespace | quote }}
   labels:
     app: nginx-static
 spec:
@@ -26,13 +25,6 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
         - name: harbor
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: node-role.kubernetes.io/control-plane
-                    operator: DoesNotExist
       containers:
         - name: nginx-static
           image: {{ .Values.repo.nginx }}

build/opal/templates/opal-cm.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+      name: opal-config
+data:
+  {{- range $key, $value := .Values.data }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}

build/opal/templates/opal_secrets.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: opal-passwords
+  namespace: {{ .Values.namespace | quote }}
+type: Opaque
+data:
+  POSTGRES_PASSWORD: Uk9PVF9EQl9QQVNTV09SRAo= #ROOT_DB_PASSWORD
+  POSTGRES_OPAL_PASSWORD: Uk9PVF9EQl9QQVNTV09SRAo= #OPAL_USER_DB_PASSWORD
+---
+#apiVersion: v1
+#kind: Secret
+#metadata:
+#  name: tls-cert
+#  namespace: {{ .Values.namespace | quote }}
+#type: kubernetes.io/tls
+#data:
+#  tls.crt: TLS_CERT
+#  tls.key: TLS_PRIVATE_KEY
+#---
+

playbook.yml

@@ -68,7 +68,7 @@
    - name: chmod startup script
      file:
        path: /usr/src/app/startup.sh
-       mode: '0550'
+       mode: '0555'
        owner: opal_deploy
        group: opal