Fix gating objects from .enabled or .deploy:

There were a few objects that were being deployed even when their parent chart or service was disabled. Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Nov 23, 2024 · 13d83af · 13d83af
1 parent a5d3329
commit 13d83af
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/tinkerbell/smee/Chart.yaml b/tinkerbell/smee/Chart.yaml
@@ -16,7 +16,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.5.0
+version: 0.5.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/tinkerbell/smee/templates/service.yaml b/tinkerbell/smee/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.deploy }}
 ---
 apiVersion: v1
 kind: Service
@@ -27,3 +28,4 @@ spec:
     protocol: UDP
   selector:
     app: {{ .Values.name }}
+{{- end }}
diff --git a/tinkerbell/stack/Chart.lock b/tinkerbell/stack/Chart.lock
@@ -4,12 +4,12 @@ dependencies:
   version: 0.3.0
 - name: smee
   repository: file://../smee
-  version: 0.5.0
+  version: 0.5.1
 - name: rufio
   repository: file://../rufio
   version: 0.3.0
 - name: hegel
   repository: file://../hegel
   version: 0.4.0
-digest: sha256:dc14a7d42c5a6e4d4c34c2ad54377b8eb523855f45501d97131034d801d0511a
-generated: "2024-10-15T10:54:54.593461345-06:00"
+digest: sha256:850f283070c59cdbd7bb7c82c3e652762cdac0ebe69587f31f5811967a534c77
+generated: "2024-11-22T20:59:21.106641504-07:00"
diff --git a/tinkerbell/stack/Chart.yaml b/tinkerbell/stack/Chart.yaml
@@ -29,7 +29,7 @@ dependencies:
     version: "0.3.0"
     repository: "file://../tink"
   - name: smee
-    version: "0.5.0"
+    version: "0.5.1"
     repository: "file://../smee"
   - name: rufio
     version: "0.3.0"

diff --git a/tinkerbell/stack/templates/hook.yaml b/tinkerbell/stack/templates/hook.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.stack.hook.enabled }}
+{{- if and .Values.stack.enabled .Values.stack.hook.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/tinkerbell/stack/templates/nginx-configmap.yaml b/tinkerbell/stack/templates/nginx-configmap.yaml
@@ -1,6 +1,6 @@
+{{ if .Values.stack.enabled -}}
 # The NGINX ConfigMap is in a separate file because its checksum is used to trigger updates in
 # the deployment.
-{{ if .Values.stack.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/tinkerbell/stack/templates/nginx_pvc.yaml b/tinkerbell/stack/templates/nginx_pvc.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.stack.hook.enabled (empty .Values.stack.hook.persistence.existingClaim ) }}
+{{- if and .Values.stack.enabled .Values.stack.hook.enabled (empty .Values.stack.hook.persistence.existingClaim ) }}
 ---
 kind: StorageClass
 apiVersion: storage.k8s.io/v1