added an affinity to the cronjob.

Author: Alexj9837

helm/blueapi/files/scripts/pvc-deletion.sh

@@ -13,7 +13,7 @@ for pvc in $BLUEAPI_PVCS; do
         #checking if its not null
         if [ -n "$LAST_USED"  ]; then
             #check if last_used is older than 3 months
-            if [ $(($NOW - LAST_USED)) -gt 2628000 ]; then
+            if [ $(($NOW - LAST_USED)) -gt 7884000 ]; then
                 #checking if the pvc is protected, if it is protected skip deletion
                 if  [ "$(kubectl get pvc $pvc -n  $RELEASE_NAMESPACE  -o=jsonpath='{.metadata.annotations.protected}')" = "true" ]; then
                     echo "PVC $pvc is protected, skipping deletion"

helm/blueapi/templates/cronjob.yaml

@@ -54,14 +54,19 @@ spec:
           tolerations:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-
+          {{- with .Values.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumes:
-            - name : {{include "blueapi.fullname" . }}-pvc-stamper-script
+            - name: {{include "blueapi.fullname" . }}-pvc-stamper-script
               configMap:
                 name: {{include "blueapi.fullname" . }}-pvc-stamper-script
                 defaultMode: 0555
-
-
           containers:
           - name: last-used-stamper
             env:
@@ -75,18 +80,6 @@ spec:
             image: bitnami/kubectl:latest
             imagePullPolicy: IfNotPresent
             command: ["/scripts/time-stamper.sh"]
-            {{- with .Values.nodeSelector }}
-            nodeSelector:
-              {{- toYaml . | nindent 8 }}
-            {{- end }}
-            {{- with .Values.affinity }}
-            affinity:
-              {{- toYaml . | nindent 8 }}
-            {{- end }}
-            {{- with .Values.tolerations }}
-            tolerations:
-              {{- toYaml . | nindent 8 }}
-            {{- end }}
           restartPolicy: OnFailure
 {{- end }}
 {{- if .Values.pvcAutoDeletion.enabled }}
@@ -146,14 +139,19 @@ spec:
           tolerations:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-
+          {{- with .Values.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumes:
-            - name : {{include "blueapi.fullname" . }}-pvc-auto-deletion-script
+            - name: {{include "blueapi.fullname" . }}-pvc-auto-deletion-script
               configMap:
                 name: {{include "blueapi.fullname" . }}-pvc-auto-deletion-script
                 defaultMode: 0555
-
-
           containers:
           - name: pvc-auto-deletion
             env:
@@ -167,18 +165,5 @@ spec:
             image: bitnami/kubectl:latest
             imagePullPolicy: IfNotPresent
             command: ["/scripts/pvc-deletion.sh"]
-            {{- with .Values.nodeSelector }}
-            nodeSelector:
-              {{- toYaml . | nindent 8 }}
-            {{- end }}
-            {{- with .Values.affinity }}
-            affinity:
-              {{- toYaml . | nindent 8 }}
-            {{- end }}
-            {{- with .Values.tolerations }}
-            tolerations:
-              {{- toYaml . | nindent 8 }}
-            {{- end }}
           restartPolicy: OnFailure
-          
 {{- end }}