Avoided empty blocks

Ontotext-AD · May 10, 2024 · c85f24e · c85f24e
1 parent 9ed146f
commit c85f24e
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 19 deletions.
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -10,10 +10,10 @@ metadata:
     {{- with .Values.ingress.labels }}
       {{- tpl (toYaml .) $ | nindent 4 }}
     {{- end }}
+  {{- with (mergeOverwrite (deepCopy .Values.annotations) .Values.ingress.annotations) }}
   annotations:
-    {{- with (mergeOverwrite (deepCopy .Values.annotations) .Values.ingress.annotations) }}
-      {{- tpl (toYaml .) $ | nindent 4 }}
-    {{- end }}
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
 spec:
   {{- with .Values.ingress.className }}
   ingressClassName: {{ . }}

diff --git a/templates/jobs/job-create-cluster.yaml b/templates/jobs/job-create-cluster.yaml
@@ -24,8 +24,9 @@ spec:
       imagePullSecrets:
         {{- include "graphdb.combinedImagePullSecrets" . | nindent 8 }}
       {{- end }}
-      securityContext:
-        {{- .Values.jobs.podSecurityContext | toYaml | nindent 8 }}
+      {{- with .Values.jobs.podSecurityContext }}
+      securityContext: {{ toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: job-temp
           emptyDir: {{ .Values.jobs.persistence.emptyDir | toYaml | nindent 12 }}
@@ -51,7 +52,9 @@ spec:
                 secretKeyRef:
                   name: {{ coalesce .Values.security.provisioner.existingSecret (include "graphdb.fullname.secret.provisioning-user" .) }}
                   key: {{ .Values.security.provisioner.tokenKey }}
-          securityContext: {{- .Values.jobs.securityContext | toYaml | nindent 12 }}
+          {{- with .Values.jobs.securityContext }}
+          securityContext: {{ toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.jobs.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}

diff --git a/templates/jobs/job-patch-cluster.yaml b/templates/jobs/job-patch-cluster.yaml
@@ -24,8 +24,9 @@ spec:
       imagePullSecrets:
         {{- include "graphdb.combinedImagePullSecrets" . | nindent 8 }}
       {{- end }}
-      securityContext:
-        {{- .Values.jobs.podSecurityContext | toYaml | nindent 8 }}
+      {{- with .Values.jobs.podSecurityContext }}
+      securityContext: {{ toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: job-temp
           emptyDir: {{ .Values.jobs.persistence.emptyDir | toYaml | nindent 12 }}
@@ -55,7 +56,9 @@ spec:
                 secretKeyRef:
                   name: {{ coalesce .Values.security.provisioner.existingSecret (include "graphdb.fullname.secret.provisioning-user" .) }}
                   key: {{ .Values.security.provisioner.tokenKey }}
-          securityContext: {{- .Values.jobs.securityContext | toYaml | nindent 12 }}
+          {{- with .Values.jobs.securityContext }}
+          securityContext: {{ toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.jobs.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}

diff --git a/templates/jobs/job-provision-repositories.yaml b/templates/jobs/job-provision-repositories.yaml
@@ -24,8 +24,9 @@ spec:
       imagePullSecrets:
         {{- include "graphdb.combinedImagePullSecrets" . | nindent 8 }}
       {{- end }}
-      securityContext:
-        {{- .Values.jobs.podSecurityContext | toYaml | nindent 8 }}
+      {{- with .Values.jobs.podSecurityContext }}
+      securityContext: {{ toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: job-temp
           emptyDir: {{ .Values.jobs.persistence.emptyDir | toYaml | nindent 12 }}
@@ -51,7 +52,9 @@ spec:
                 secretKeyRef:
                   name: {{ coalesce .Values.security.provisioner.existingSecret (include "graphdb.fullname.secret.provisioning-user" .) }}
                   key: {{ .Values.security.provisioner.tokenKey }}
-          securityContext: {{- .Values.jobs.securityContext | toYaml | nindent 12 }}
+          {{- with .Values.jobs.securityContext }}
+          securityContext: {{ toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.jobs.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}

diff --git a/templates/jobs/job-scale-down-cluster.yaml b/templates/jobs/job-scale-down-cluster.yaml
@@ -23,8 +23,9 @@ spec:
       imagePullSecrets:
         {{- include "graphdb.combinedImagePullSecrets" . | nindent 8 }}
       {{- end }}
-      securityContext:
-        {{- .Values.jobs.podSecurityContext | toYaml | nindent 8 }}
+      {{- with .Values.jobs.podSecurityContext }}
+      securityContext: {{ toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: job-temp
           emptyDir: {{ .Values.jobs.persistence.emptyDir | toYaml | nindent 12 }}
@@ -53,7 +54,9 @@ spec:
                 secretKeyRef:
                   name: {{ coalesce .Values.security.provisioner.existingSecret (include "graphdb.fullname.secret.provisioning-user" .) }}
                   key: {{ .Values.security.provisioner.tokenKey }}
-          securityContext: {{- .Values.jobs.securityContext | toYaml | nindent 12 }}
+          {{- with .Values.jobs.securityContext }}
+          securityContext: {{ toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.jobs.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}

diff --git a/templates/jobs/job-scale-up-cluster.yaml b/templates/jobs/job-scale-up-cluster.yaml
@@ -24,8 +24,9 @@ spec:
       imagePullSecrets:
         {{- include "graphdb.combinedImagePullSecrets" . | nindent 8 }}
       {{- end }}
-      securityContext:
-        {{- .Values.jobs.podSecurityContext | toYaml | nindent 8 }}
+      {{- with .Values.jobs.podSecurityContext }}
+      securityContext: {{ toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: job-temp
           emptyDir: {{ .Values.jobs.persistence.emptyDir | toYaml | nindent 12 }}
@@ -54,7 +55,9 @@ spec:
                 secretKeyRef:
                   name: {{ coalesce .Values.security.provisioner.existingSecret (include "graphdb.fullname.secret.provisioning-user" .) }}
                   key: {{ .Values.security.provisioner.tokenKey }}
-          securityContext: {{- .Values.jobs.securityContext | toYaml | nindent 12 }}
+          {{- with .Values.jobs.securityContext }}
+          securityContext: {{ toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.jobs.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}

diff --git a/values.yaml b/values.yaml
@@ -389,7 +389,7 @@ resources:
     memory: 2Gi
   requests:
     memory: 2Gi
-    cpu: 0.5
+    cpu: 500m
 
 # initContainerResources defines resource requests and limits for the node containers provisioning configurations for graphdb.
 initContainerResources: {}