fix the templating errors in the chart due to broke if

jessebot · Jul 10, 2024 · 165282a · 165282a
1 parent 7ef73b0
commit 165282a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 25 deletions.
diff --git a/charts/onboardme/Chart.yaml b/charts/onboardme/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.1.0
+version: 0.1.1
 
 # 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

diff --git a/charts/onboardme/templates/NOTES.txt b/charts/onboardme/templates/NOTES.txt
@@ -20,3 +20,7 @@
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
 {{- end }}
+
+You did it! You installed onboardme! You can access your container with:
+
+kubectl exec -it $POD_NAME -- /bin/bash
diff --git a/charts/onboardme/templates/deployment.yaml b/charts/onboardme/templates/deployment.yaml
@@ -28,24 +28,34 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "onboardme.serviceAccountName" . }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
+          {{- with .Values.securityContext }}
           securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+          {{- with .Values.livenessProbe }}
           livenessProbe:
-            {{- toYaml .Values.livenessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.readinessProbeEnabled }}
           readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.resources }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.volumeMounts }}
           volumeMounts:
             {{- toYaml . | nindent 12 }}

diff --git a/charts/onboardme/values.yaml b/charts/onboardme/values.yaml
@@ -39,7 +39,7 @@ podSecurityContext:
 securityContext:
   capabilities:
     drop:
-    - ALL
+      - ALL
   readOnlyRootFilesystem: true
   runAsNonRoot: true
   runAsUser: 1000
@@ -63,24 +63,24 @@ ingress:
   #      - chart-example.local
 
 resources: {}
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-livenessProbe:
-  enabled: false
-  httpGet:
-    path: /
-    port: http
-
-readinessProbe:
-  enabled: false
-  httpGet:
-    path: /
-    port: http
+#  limits:
+#    cpu: 100m
+#    memory: 128Mi
+#  requests:
+#    cpu: 100m
+#    memory: 128Mi
+
+leadinessProbeEnabled: false
+livenessProbe: {}
+# httpGet:
+#   path: /
+#   port: http
+
+readinessProbeEnabled: false
+readinessProbe: {}
+#  httpGet:
+#    path: /
+#    port: http
 
 autoscaling:
   enabled: false