updates from code review

Author: nvanthao

applications/wg-easy/Taskfile.yaml

@@ -185,8 +185,7 @@ tasks:
     desc: Run preflight checks on Helm charts using preflight CLI (use DRY_RUN=true for dry-run)
     silent: false
     vars:
-      DRY_RUN:
-        default: false
+      DRY_RUN: '{{.DRY_RUN | default "false"}}'
     cmds: 
       - |
         PREFLIGHT_FLAGS=""

applications/wg-easy/charts/cert-manager/templates/_preflight.tpl

@@ -0,0 +1,21 @@
+{{- define "cert-manager.preflight" -}}
+apiVersion: troubleshoot.sh/v1beta2
+kind: Preflight
+metadata:
+  name: cert-manager-preflights
+spec:
+  analyzers:
+    # https://github.com/cert-manager/cert-manager/blob/master/deploy/charts/cert-manager/README.template.md#prerequisites
+    - clusterVersion:
+        outcomes:
+          - fail:
+              when: "< 1.22.0"
+              message: The application requires at least Kubernetes 1.22.0, and recommends 1.25.0.
+              uri: https://cert-manager.io/docs/installation/helm/#prerequisites
+          - warn:
+              when: "< 1.25.0"
+              message: Your cluster meets the minimum version of Kubernetes, but we recommend you update to 1.25.0 or later.
+              uri: https://cert-manager.io/docs/installation/helm/#prerequisites
+          - pass:
+              message: Your cluster meets the recommended and required versions of Kubernetes.
+{{- end -}} 

applications/wg-easy/charts/cert-manager/templates/secret-preflights.yaml

@@ -7,22 +7,4 @@ metadata:
 type: Opaque
 stringData:
   preflight.yaml: |
-    apiVersion: troubleshoot.sh/v1beta2
-    kind: Preflight
-    metadata:
-      name: cert-manager-preflights
-    spec:
-      analyzers:
-        # https://github.com/cert-manager/cert-manager/blob/master/deploy/charts/cert-manager/README.template.md#prerequisites
-        - clusterVersion:
-            outcomes:
-              - fail:
-                  when: "< 1.22.0"
-                  message: The application requires at least Kubernetes 1.22.0, and recommends 1.25.0.
-                  uri: https://cert-manager.io/docs/installation/helm/#prerequisites
-              - warn:
-                  when: "< 1.25.0"
-                  message: Your cluster meets the minimum version of Kubernetes, but we recommend you update to 1.25.0 or later.
-                  uri: https://cert-manager.io/docs/installation/helm/#prerequisites
-              - pass:
-                  message: Your cluster meets the recommended and required versions of Kubernetes.
+{{ include "cert-manager.preflight" . | indent 4 }}

applications/wg-easy/charts/wg-easy/templates/_preflight.tpl

@@ -0,0 +1,20 @@
+{{- define "wg-easy.preflight" -}}
+apiVersion: troubleshoot.sh/v1beta2
+kind: Preflight
+metadata:
+  name: wg-easy-preflights
+spec:
+  collectors:
+    - sysctl:
+        image: debian:buster-slim
+  analyzers:
+    - sysctl:
+        checkName: IP forwarding enabled
+        outcomes:
+          - fail:
+              when: 'net.ipv4.ip_forward == 0'
+              message: "IP forwarding must be enabled. To enable it, edit /etc/sysctl.conf, add or uncomment the line 'net.ipv4.ip_forward=1', and run 'sudo sysctl -p'."
+          - pass:
+              when: 'net.ipv4.ip_forward == 1'
+              message: "IP forwarding is enabled."
+{{- end -}} 

applications/wg-easy/charts/wg-easy/templates/secret-preflights.yaml

@@ -7,21 +7,4 @@ metadata:
 type: Opaque
 stringData:
   preflight.yaml: |
-    apiVersion: troubleshoot.sh/v1beta2
-    kind: Preflight
-    metadata:
-      name: wg-easy-preflights
-    spec:
-      collectors:
-        - sysctl:
-            image: debian:buster-slim
-      analyzers:
-        - sysctl:
-            checkName: IP forwarding enabled
-            outcomes:
-              - fail:
-                  when: 'net.ipv4.ip_forward == 0'
-                  message: "IP forwarding must be enabled. To enable it, edit /etc/sysctl.conf, add or uncomment the line 'net.ipv4.ip_forward=1', and run 'sudo sysctl -p'."
-              - pass:
-                  when: 'net.ipv4.ip_forward == 1'
-                  message: "IP forwarding is enabled."
+{{ include "wg-easy.preflight" . | indent 4 }}