Draft: fix: Restructure HELM charts, secrets encryption

Dockerfile

@@ -13,6 +13,16 @@ LABEL maintainer.organisation="ELIXIR Cloud & AAI"
 
 RUN groupadd -r pubgrade --gid 1000 && useradd -d /home/pubgrade -ms /bin/bash -r -g pubgrade pubgrade --uid 1000
 
+RUN apt update && apt install -y \
+    curl \
+    gnupg \
+    && apt clean && rm -rf /var/lib/apt/lists/*
+
+ENV SOPS_VERSION v3.8.0
+
+RUN curl -Lo /usr/local/bin/sops https://github.com/getsops/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux.amd64 && \
+    chmod +x /usr/local/bin/sops
+
 ## Copy remaining app files
 COPY --chown=1000:1000 ./ /app
 

Makefile

@@ -1,4 +1,4 @@
-IMAGE_NAME_PUBGRADE=akash7778/pubgrade
+IMAGE_NAME_PUBGRADE=akash7778/pubgrade:test_build_1
 IMAGE_NAME_UPDATER=akash7778/pubgrade-updater
 APP_NAME=pubgrade
 
@@ -21,7 +21,7 @@ test: ## Runs unit tests and shows coverage.
 	coverage report -m
 
 install-pubgrade: # build ## Install pubgrade on cluster using helm.
-	kubectl create namespace $(APP_NAME) --dry-run=client -o yaml | kubectl apply -f -
+#	kubectl create namespace $(APP_NAME) --dry-run=client -o yaml | kubectl apply -f -
 	sed -i 's#akash7778/pubgrade:test_build#$(IMAGE_NAME_PUBGRADE)#g' deployment/values.yaml
 	sed -i 's#akash7778/notify-completion#$(IMAGE_NAME_UPDATER)#g' deployment/values.yaml
 	helm upgrade --install $(APP_NAME) deployment/ -n $(APP_NAME)

deployment/Chart.yaml → helm/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v2
+apiVersion: v1
 name: pubgrade
 description: A Helm chart for Kubernetes
 type: application

helm/templates/pubgrade-build-complete-updater/deployment.yaml

@@ -0,0 +1,25 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: build-complete-updater
+spec:
+ replicas: {{ .Values.pubgrade_build_complete_updater.replicaCount }}
+ selector:
+   matchLabels:
+     app: {{ .Values.appName }}
+ template:
+   metadata:
+     labels:
+       app: {{ .Values.appName }}
+   spec:
+          serviceAccountName: {{ .Values.pubgrade_webserver.serviceAccountName }}
+          automountServiceAccountToken: true
+          containers:
+          - image: {{ .Values.pubgrade_build_complete_updater.image }}
+            name: pubgrade_build_complete_updater
+            imagePullPolicy: {{ .Values.pubgrade_build_complete_updater.imagePullPolicy }}
+            env:
+              - name: NAMESPACE
+                value: {{ .Release.Namespace }}
+              - name: BROKER_URL
+                value: {{ .Values.pubgrade_url }}

helm/templates/pubgrade-mongodb/deployment.yaml

@@ -0,0 +1,32 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.pubgrade_mongodb.name }}
+  labels:
+    app: db
+spec:
+  replicas: {{ .Values.pubgrade_mongodb.replicaCount }}
+  selector:
+    matchLabels:
+      app: db
+  template:
+    metadata:
+      labels:
+        app: db
+    spec:
+      securityContext:
+        runAsUser: {{ .Values.pubgrade_mongodb.securityContext.runAsUser }}
+      containers:
+      - name: mongodb
+        image: {{ .Values.pubgrade_mongodb.image }}
+        ports:
+        - containerPort: {{ .Values.pubgrade_mongodb.port }}
+          name: db-container
+        volumeMounts:
+          - mountPath: /data/db
+            name: {{ .Values.pubgrade_mongodb.volume.name }}
+      volumes:
+       - name: {{ .Values.pubgrade_mongodb.volume.name }}
+         persistentVolumeClaim:
+               claimName: {{ .Values.pubgrade_mongodb.volume.claimName }}
+

helm/templates/pubgrade-mongodb/pvc.yaml

@@ -0,0 +1,30 @@
+{{ if .Values.pubgrade_mongodb.volume.storageActive }}
+{{ if .Values.pubgrade_mongodb.volume.deployLocalPv }}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+ name: mongo-pv
+ labels:
+   type: local
+spec:
+ storageClassName: {{ .Values.pubgrade_mongodb.volume.storageClass }}
+ capacity:
+   storage: {{ .Values.pubgrade_mongodb.volume.size }}
+ accessModes:
+   - ReadWriteOnce
+ hostPath:
+   path: {{ .Values.pubgrade_mongodb.volume.pathToLocalDir }}
+{{ end }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ name: {{ .Values.pubgrade_mongodb.volume.claimName }}
+spec:
+ storageClassName: {{ .Values.pubgrade_mongodb.volume.storageClass }}
+ accessModes:
+   - ReadWriteOnce
+ resources:
+   requests:
+     storage: {{ .Values.pubgrade_mongodb.volume.size }}
+{{ end }}