fix(httpd) remove all mocks from packaged chart

Signed-off-by: Damien Duportal <[email protected]>
jenkins-infra · Oct 4, 2023 · e624207 · e624207
1 parent 92fc2ad
commit e624207
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/charts/httpd/.helmignore b/charts/httpd/.helmignore
@@ -20,3 +20,4 @@
 .idea/
 *.tmproj
 .vscode/
+tests/
diff --git a/charts/httpd/Chart.yaml b/charts/httpd/Chart.yaml
@@ -1,4 +1,8 @@
 apiVersion: v1
 description: httpd helm chart for Kubernetes
 name: httpd
-version: 0.2.0
+version: 0.2.1
+appVersion: v2.4
+maintainers:
+- email: [email protected]
+  name: jenkins-infra-team
diff --git a/charts/httpd/templates/_helpers.tpl b/charts/httpd/templates/_helpers.tpl
@@ -49,14 +49,14 @@ Data directory volume definition. Might be defined from parent chart templates o
 based on the presence of the global value provided by the parent chart.
 */}}
 {{- define "httpd.html-volume" -}}
-{{- if (dig "global" "storage" "enabled" false .Values.AsMap) -}}
+{{- if and (dig "global" "storage" "enabled" false .Values.AsMap) .Values.global.storage.claimNameTpl -}}
 persistentVolumeClaim:
-  claimName: {{ include "mirrorbits-parent.pvc-name" . }}
-{{- else }}
-  {{- if or .Values.repository.persistentVolumeClaim.enabled .Values.repository.reuseExistingPersistentVolumeClaim }}
+  claimName: {{ tpl .Values.global.storage.claimNameTpl $ }}
+{{- else -}}
+  {{- if or .Values.repository.persistentVolumeClaim.enabled .Values.repository.reuseExistingPersistentVolumeClaim -}}
 persistentVolumeClaim:
-  claimName: {{ .Values.repository.name | default (printf "%s-binary" (include "httpd.fullname" .)) }}
-  {{- else }}
+  claimName: {{ .Values.repository.name | default (printf "%s-binary" (include "httpd.fullname" .)) -}}
+  {{- else -}}
 emptyDir: {}
   {{- end -}}
 {{- end -}}

diff --git a/charts/httpd/templates/mocks/_helpers.tpl b/charts/httpd/templates/mocks/_helpers.tpl
diff --git a/charts/httpd/tests/parent_values_test.yaml b/charts/httpd/tests/parent_values_test.yaml
@@ -10,6 +10,7 @@ set:
   global:
     storage:
       enabled: true
+      claimNameTpl: '{{ default "parent-chart-shared-data" }}'
     ingress:
       enabled: true
   # Try to specify a ingress which must be ignored (parent prevails)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,3 +20,4 @@ @@
     .idea/
     *.tmproj
     .vscode/
+    tests/