Support for Gimlet metadata annotations

This reverts commit c4b19f2801.

.github/workflows/release.yml

@@ -96,6 +96,7 @@ jobs:
 
         sed -i "s/version: $CHART_VERSION/version: $increased_version/" charts/onechart/Chart.yaml
         sed -i "s/version: $CHART_VERSION/version: $increased_version/" charts/cron-job/Chart.yaml
+        sed -i "s/version: $CHART_VERSION/version: $increased_version/" charts/static-site/Chart.yaml
 
         git status
         git add .

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Makefile

@@ -7,25 +7,32 @@ lint:
 	helm lint charts/onechart/
 	helm lint charts/cron-job/
 	helm lint charts/namespaces/
+	helm lint charts/static-site
 
 kubeval:
 	rm -rf manifests && true
 	mkdir manifests
 	helm template charts/onechart --output-dir manifests
-	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.13.0
-	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.18.0
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.20.0
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.24.0
 
 	rm -rf manifests && true
 	mkdir manifests
 	helm template charts/cron-job --output-dir manifests
-	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.13.0
-	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.18.0
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.20.0
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.24.0
 
 	rm -rf manifests && true
 	mkdir manifests
-	helm template charts/namespaces --output-dir manifests
-	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.13.0
-	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.18.0
+	helm template charts/namespaces --output-dir manifests -f charts/namespaces/fixture.yaml
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.20.0
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.24.0
+
+	rm -rf manifests && true
+	mkdir manifests
+	helm template charts/static-site --output-dir manifests
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.20.0
+	find manifests/ -name '*.yaml' | xargs kubeval --ignore-missing-schemas -v 1.24.0
 
 test:
 	helm dependency update charts/onechart
@@ -36,16 +43,23 @@ test:
 
 	helm unittest charts/namespaces
 
+	helm unittest charts/static-site
+
 package:
+	helm dependency update charts/onechart
 	helm package charts/onechart
 	mv onechart*.tgz docs
 
+	helm dependency update charts/cron-job
 	helm package charts/cron-job
 	mv cron-job*.tgz docs
 
 	helm package charts/namespaces
 	mv namespaces*.tgz docs
 
+	helm package charts/static-site
+	mv static-site*.tgz docs
+
 	helm repo index docs --url https://chart.onechart.dev
 
 debug:

README.md

@@ -4,7 +4,7 @@ A generic Helm chart for your application deployments.
 
 Because no-one can remember the Kubernetes yaml syntax.
 
-https://onechart.dev/
+https://gimlet.io/docs/onechart-reference
 
 ## Getting started
 
@@ -30,7 +30,7 @@ helm install my-release onechart/onechart \
   --set image.tag=1.19.3
 ```
 
-See all [Examples](/examples/deploying-an-image)
+See all [Examples](/website/docs/examples/)
 
 ## Contribution Guidelines
 

charts/common/Chart.yaml

@@ -15,4 +15,4 @@ type: library
 # 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.3.1

charts/common/templates/_customFileConfigmap.yaml

@@ -0,0 +1,16 @@
+{{- define "common.customFileConfigmap.tpl" -}}
+{{- range .Values.volumes }}
+  {{- if .fileName }}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.robustName" .fileName }}
+  namespace: {{ $.Release.Namespace }}
+data:
+  {{ .fileName }}: |
+    {{- .fileContent | nindent 4 }}
+
+  {{- end }}  
+{{- end }}
+{{- end -}}

charts/common/templates/_envFromRef.yaml

@@ -1,5 +1,5 @@
 {{- define "common.envFromRef.tpl" -}}
-{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName }}
+{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName -}}
 envFrom: &envFrom
 {{- if .Values.vars }}
   - configMapRef:
@@ -18,4 +18,4 @@ envFrom: &envFrom
       name: {{ template "common.robustName" .Release.Name }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/common/templates/_pvc.yaml

@@ -1,6 +1,6 @@
 {{- define "common.pvc.tpl" -}}
 {{- range .Values.volumes }}
-{{- if not .existingClaim }}
+{{- if not (or .existingClaim .hostPath .fileName .emptyDir .existingConfigMap) }}
 {{- $robustName := include "common.robustName" $.Release.Name }}
 ---
 apiVersion: v1
@@ -8,13 +8,19 @@ kind: PersistentVolumeClaim
 metadata:
   name: {{ printf "%s-%s" $robustName .name }}
   namespace: {{ $.Release.Namespace }}
+  {{- if .pvcAnnotations }}
+  annotations:
+    {{- toYaml .pvcAnnotations | nindent 4 }}
+  {{- end }} 
 spec:
   accessModes:
     - {{ .accessMode | default "ReadWriteOnce" }}
-  storageClassName: {{ .storageClass | default "local-path" }}
+  {{- if .storageClass }}
+  storageClassName: {{ .storageClass }}
+  {{- end }}
   resources:
     requests:
       storage: {{ .size | default "1Gi" }}
 {{- end }}
 {{- end }}
-{{- end -}}
+{{- end -}}

charts/common/templates/_volumeMountsRef.yaml

@@ -1,19 +1,39 @@
 {{- define "common.volumeMountsRef.tpl" -}}
-{{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
+{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
 volumeMounts: &volumeMounts
 {{- range .Values.volumes }}
+{{- if not (hasPrefix "init-" .name) }}
   - name: {{ .name }}
     mountPath: {{ .path }}
-{{- end }}
+    {{- if .subPath }}
+    subPath: {{ .subPath }}
+    {{- end }}
+{{- end }}    
+{{- end }}    
 {{- range .Values.sealedFileSecrets }}
   - name: {{ .name }}
     mountPath: {{ .path }}
+    {{- if .subPath}}
+    subPath: {{ .subPath }}
+    {{- end }} 
     readOnly: true
 {{- end }}
 {{- range .Values.fileSecrets }}
   - name: {{ .name }}
     mountPath: {{ .path }}
+    {{- if .subPath}}
+    subPath: {{ .subPath }}
+    {{- end }} 
+    readOnly: true
+{{- end }}
+{{- range .Values.existingFileSecrets }}
+  - name: {{ .name }}
+    mountPath: {{ .path }}
+    {{- if .subPath}}
+    subPath: {{ .subPath }}
+    {{- end }} 
     readOnly: true
 {{- end }}
 {{- end }}
 {{- end }}
+

charts/common/templates/_volumesRef.yaml

@@ -1,15 +1,31 @@
 {{- define "common.volumesRef.tpl" -}}
-{{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
+{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
 volumes:
   {{- range .Values.volumes }}
   - name: {{ .name }}
+    {{- if .emptyDir }}
+    emptyDir: {}
+    {{- else if .existingConfigMap }}
+    configMap:
+      name: {{ .existingConfigMap }}
+    {{- else if .fileName }}
+    configMap:
+      name: {{ template "common.robustName" .fileName }}
+    {{- else if .hostPath }}
+    hostPath:
+      path: {{ .hostPath.path }}
+      {{- if .hostPath.type }}
+      type: {{ .hostPath.type }}
+      {{- end }}
+    {{- else }}
     persistentVolumeClaim:
       {{- if .existingClaim }}
       claimName: {{ .existingClaim }}
       {{ else }}
       claimName: {{ printf "%s-%s" $.Release.Name .name }}
       {{- end }}
-  {{- end }}
+      {{- end }}
+{{- end }}     
   {{- range .Values.sealedFileSecrets }}
   - name: {{ .name }}
     secret:
@@ -20,5 +36,10 @@ volumes:
     secret:
       secretName: {{ printf "%s-%s" $.Release.Name .name }}
   {{- end }}
+  {{- range .Values.existingFileSecrets }}
+  - name: {{ .name }}
+    secret:
+      secretName: {{ .name }}
+  {{- end }}
 {{- end }}
 {{- end -}}

charts/cron-job/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.1.0
-digest: sha256:636a65e9846bdff17cc4e65b0849061f783759a37aa51fb85ff6fd8ba5e68467
-generated: "2021-08-05T10:18:17.533366128+02:00"
+  version: 0.3.1
+digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681
+generated: "2023-08-18T08:34:24.144108449+02:00"

charts/cron-job/Chart.yaml

@@ -15,9 +15,9 @@ 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.32.0
+version: 0.57.0
 
 dependencies:
   - name: common
-    version: 0.1.0
+    version: 0.3.1
     repository: file://../common

charts/cron-job/helm-ui.json

@@ -1,6 +1,7 @@
 [
   {
     "schemaIDs": [
+      "#/properties/schedule",
       "#/properties/image",
       "#/properties/shell",
       "#/properties/command"

charts/cron-job/templates/cronJob.yaml

@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: {{ .Release.Name }}

charts/cron-job/tests/cronjob_schedule_test.yaml

@@ -0,0 +1,11 @@
+suite: test cron job
+templates:
+  - cronJob.yaml
+tests:
+  - it: Should set schedule
+    set:
+      schedule: "*/1 * * * *"
+    asserts:
+      - equal:
+          path: spec.schedule
+          value: "*/1 * * * *"

charts/cron-job/values.schema.json

@@ -238,6 +238,13 @@
       "description": "The command to run in the cronjob",
       "default": "echo \"I'm alive\""
     },
+    "schedule": {
+      "$id": "#/properties/schedule",
+      "type": "string",
+      "title": "Schedule",
+      "description": "Schedule your cronjob",
+      "default": "*/1 * * * *"
+    },
     "vars": {
       "$id": "#/properties/vars",
       "type": "object",

charts/namespaces/Chart.yaml

@@ -15,4 +15,4 @@ 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.2.0
+version: 0.3.0

charts/namespaces/fixture.yaml

@@ -0,0 +1,18 @@
+namespaces:
+  - name: staging
+    quota:
+      cpu: 32
+      memory: "64Gi"
+      storage: "500Gi"
+    overcommit:
+      cpu: 1
+      memory: 1
+    podMaximumResources:
+      cpu: 4
+      memory: "8Gi"
+    podDefaultResources:
+      cpu: "200m"
+      memory: "200Mi"
+    podResourceOvercommit:
+      cpu: 2
+      memory: 1

charts/namespaces/templates/limit-range.yaml

@@ -1,22 +1,5 @@
 {{- range .Values.namespaces }}
-{{- $limits := $.Values.pod.limits }}
-{{- if .pod }}
-{{- if .pod.limits }}
-{{- $limits = .pod.limits }}
-{{- end }}
-{{- end }}
-{{- $overcommit := $.Values.pod.overcommit }}
-{{- if .pod }}
-{{- if .pod.overcommit }}
-{{- $overcommit = .pod.overcommit }}
-{{- end }}
-{{- end }}
-{{- $defaults := $.Values.pod.defaults }}
-{{- if .pod }}
-{{- if .pod.defaults }}
-{{- $defaults = .pod.defaults }}
-{{- end }}
-{{- end }}
+{{- if and .podMaximumResources (and .podDefaultResources .podResourceOvercommit) }}
 ---
 apiVersion: v1
 kind: LimitRange
@@ -26,19 +9,26 @@ metadata:
 spec:
   limits:
     - type: Container
+      {{- if .podMaximumResources }}
       max:
-        cpu: 4
-        memory: "8Gi"
-      min:
-        cpu: "100m"
-        memory: "50Mi"
+        cpu: {{ .podMaximumResources.cpu }}
+        memory: {{ .podMaximumResources.memory }}
+      {{- end }}
+      {{- if .podDefaultResources }}
       default:
-        cpu: {{ $defaults.cpu }}
-        memory: {{ $defaults.memory }}
+        cpu: {{ .podDefaultResources.cpu }}
+        memory: {{ .podDefaultResources.memory }}
       defaultRequest:
-        cpu: {{ $defaults.cpu }}
-        memory: {{ $defaults.memory }}
+        cpu: {{ .podDefaultResources.cpu }}
+        memory: {{ .podDefaultResources.memory }}
+      {{- end }}
       maxLimitRequestRatio:
-        cpu: {{ $overcommit.cpu }}
-        memory: {{ $overcommit.memory }}
+        {{- if .podResourceOvercommit }}
+        cpu: {{ .podResourceOvercommit.cpu }}
+        memory: {{ .podResourceOvercommit.memory }}
+        {{ else }}
+        cpu: 1
+        memory: 1
+        {{- end }}
+{{- end }}
 {{- end }}

charts/namespaces/templates/namespace.yaml

@@ -4,8 +4,8 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .name }}
+  {{- if .annotations }}
   annotations:
-    {{- if .annotations }}
     {{- toYaml .annotations | nindent 4 }}
-    {{- end }}
+  {{- end }}
 {{- end }}

charts/namespaces/templates/resource-quota.yaml

@@ -1,16 +1,5 @@
 {{- range .Values.namespaces }}
-{{- $budget := $.Values.namespace.budget }}
-{{- if .namespace }}
-{{- if .namespace.budget }}
-{{- $budget = .namespace.budget }}
-{{- end }}
-{{- end }}
-{{- $overcommit := $.Values.namespace.overcommit }}
-{{- if .namespace }}
-{{- if .namespace.overcommit }}
-{{- $overcommit = .namespace.overcommit }}
-{{- end }}
-{{- end }}
+{{- if and .quota .overcommit }}
 ---
 apiVersion: v1
 kind: ResourceQuota
@@ -18,9 +7,10 @@ metadata:
   name: {{ .name }}
 spec:
   hard:
-    limits.cpu: {{ $budget.cpu | mul $overcommit.cpu }}
-    limits.memory: {{ $budget.memory | regexFind "[1-9]+" | mul $overcommit.memory }}{{ $budget.memory | regexFind "[a-zA-Z]+"  }}
-    requests.cpu: {{ $budget.cpu }}
-    requests.memory: {{ $budget.memory }}
-    requests.storage: {{ $budget.storage }}
+    limits.cpu: {{ .quota.cpu | mul .overcommit.cpu }}
+    limits.memory: {{ .quota.memory | regexFind "[1-9]+" | mul .overcommit.memory }}{{ .quota.memory | regexFind "[a-zA-Z]+"  }}
+    requests.cpu: {{ .quota.cpu }}
+    requests.memory: {{ .quota.memory }}
+    requests.storage: {{ .quota.storage }}
 {{- end }}
+{{- end -}}

charts/namespaces/tests/limit_range_test.yaml

@@ -2,52 +2,19 @@ suite: test deployment
 templates:
   - limit-range.yaml
 tests:
-  - it: Should set default limits
-    set:
-      pod:
-        limits:
-          cpu: 4
-          memory: "8Gi"
-        defaults:
-          cpu: "200m"
-          memory: "200Mi"
-        overcommit:
-          cpu: 10
-          memory: 2
-    asserts:
-      - equal:
-          path: spec.limits
-          value:
-            - type: Container
-              max:
-                cpu: 4
-                memory: "8Gi"
-              min:
-                cpu: "100m"
-                memory: "50Mi"
-              default:
-                cpu: "200m"
-                memory: "200Mi"
-              defaultRequest:
-                cpu: "200m"
-                memory: "200Mi"
-              maxLimitRequestRatio:
-                cpu: 10
-                memory: 2
   - it: Should set namespace specific limits
     set:
       namespaces:
         - name: staging
-          pod:
-            limits:
-              cpu: 4
-              memory: "8Gi"
-            defaults:
-              cpu: "200m"
-              memory: "200Mi"
-            overcommit:
-              cpu: 10
-              memory: 2
+          podMaximumResources:
+            cpu: 4
+            memory: "8Gi"
+          podDefaultResources:
+            cpu: "200m"
+            memory: "200Mi"
+          podResourceOvercommit:
+            cpu: 2
+            memory: 1
     asserts:
       - equal:
           path: spec.limits
@@ -56,9 +23,6 @@ tests:
               max:
                 cpu: 4
                 memory: "8Gi"
-              min:
-                cpu: "100m"
-                memory: "50Mi"
               default:
                 cpu: "200m"
                 memory: "200Mi"
@@ -66,5 +30,5 @@ tests:
                 cpu: "200m"
                 memory: "200Mi"
               maxLimitRequestRatio:
-                cpu: 10
-                memory: 2
+                cpu: 2
+                memory: 1

charts/namespaces/tests/ns_test.yaml

@@ -10,3 +10,10 @@ tests:
       - equal:
           path: metadata.name
           value: staging
+  - it: Should not set annotations if none provided in values
+    set:
+      namespaces:
+        - name: staging
+    asserts:
+      - isNull:
+          path: metadata.annotations

charts/namespaces/tests/resource_quota_test.yaml

@@ -2,16 +2,37 @@ suite: test deployment
 templates:
   - resource-quota.yaml
 tests:
-  - it: Should set default quota values
+  - it: Should set namespace specific quotas
     set:
-      namespace:
-        budget:
-          cpu: 32
-          memory: "64Gi"
-          storage: "500Gi"
-        overcommit:
-          cpu: 2
-          memory: 1
+      namespaces:
+        - name: staging
+          quota:
+            cpu: 32
+            memory: "64Gi"
+            storage: "500Gi"
+          overcommit:
+            cpu: 1
+            memory: 1
+    asserts:
+      - equal:
+          path: spec.hard
+          value:
+            limits.cpu: 32
+            limits.memory: "64Gi"
+            requests.cpu: 32
+            requests.memory: "64Gi"
+            requests.storage: "500Gi"
+  - it: Should handle overcommit
+    set:
+      namespaces:
+        - name: staging
+          quota:
+            cpu: 32
+            memory: "64Gi"
+            storage: "500Gi"
+          overcommit:
+            cpu: 2
+            memory: 1
     asserts:
       - equal:
           path: spec.hard
@@ -21,29 +42,3 @@ tests:
             requests.cpu: 32
             requests.memory: "64Gi"
             requests.storage: "500Gi"
-  - it: Should set namespace specific quotas
-    set:
-      namespaces:
-        - name: staging
-          namespace:
-            budget:
-              cpu: 8
-              memory: "16Gi"
-              storage: "100Gi"
-      namespace:
-        budget:
-          cpu: 32
-          memory: "64Gi"
-          storage: "500Gi"
-        overcommit:
-          cpu: 2
-          memory: 1
-    asserts:
-      - equal:
-          path: spec.hard
-          value:
-            limits.cpu: 16
-            limits.memory: "16Gi"
-            requests.cpu: 8
-            requests.memory: "16Gi"
-            requests.storage: "100Gi"

charts/namespaces/values.schema.json

@@ -1,715 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "http://example.com/example.json",
-  "type": "object",
-  "title": "The root schema",
-  "description": "The root schema comprises the entire JSON document.",
-  "default": {},
-  "examples": [
-    {
-      "namespaces": [
-        {
-          "name": "staging",
-          "namespace": {
-            "budget": {
-              "cpu": 32,
-              "memory": "64Gi",
-              "storage": "500Gi"
-            },
-            "overcommit": {
-              "cpu": 2,
-              "memory": 1
-            }
-          },
-          "pod": {
-            "limits": {
-              "cpu": 4,
-              "memory": "8Gi"
-            },
-            "defaults": {
-              "cpu": "200m",
-              "memory": "200Mi"
-            },
-            "overcommit": {
-              "cpu": 10,
-              "memory": 2
-            }
-          }
-        }
-      ],
-      "namespace": {
-        "budget": {
-          "cpu": 32,
-          "memory": "64Gi",
-          "storage": "500Gi"
-        },
-        "overcommit": {
-          "cpu": 2,
-          "memory": 1
-        }
-      },
-      "pod": {
-        "limits": {
-          "cpu": 4,
-          "memory": "8Gi"
-        },
-        "defaults": {
-          "cpu": "200m",
-          "memory": "200Mi"
-        },
-        "overcommit": {
-          "cpu": 10,
-          "memory": 2
-        }
-      }
-    }
-  ],
-  "required": [
-    "namespaces",
-    "namespace",
-    "pod"
-  ],
-  "properties": {
-    "namespaces": {
-      "$id": "#/properties/namespaces",
-      "type": "array",
-      "title": "The namespaces schema",
-      "description": "An explanation about the purpose of this instance.",
-      "default": [],
-      "examples": [
-        [
-          {
-            "name": "staging",
-            "namespace": {
-              "budget": {
-                "cpu": 32,
-                "memory": "64Gi",
-                "storage": "500Gi"
-              },
-              "overcommit": {
-                "cpu": 2,
-                "memory": 1
-              }
-            },
-            "pod": {
-              "limits": {
-                "cpu": 4,
-                "memory": "8Gi"
-              },
-              "defaults": {
-                "cpu": "200m",
-                "memory": "200Mi"
-              },
-              "overcommit": {
-                "cpu": 10,
-                "memory": 2
-              }
-            }
-          }
-        ]
-      ],
-      "additionalItems": true,
-      "items": {
-        "$id": "#/properties/namespaces/items",
-        "anyOf": [
-          {
-            "$id": "#/properties/namespaces/items/anyOf/0",
-            "type": "object",
-            "title": "The first anyOf schema",
-            "description": "An explanation about the purpose of this instance.",
-            "default": {},
-            "examples": [
-              {
-                "name": "staging",
-                "namespace": {
-                  "budget": {
-                    "cpu": 32,
-                    "memory": "64Gi",
-                    "storage": "500Gi"
-                  },
-                  "overcommit": {
-                    "cpu": 2,
-                    "memory": 1
-                  }
-                },
-                "pod": {
-                  "limits": {
-                    "cpu": 4,
-                    "memory": "8Gi"
-                  },
-                  "defaults": {
-                    "cpu": "200m",
-                    "memory": "200Mi"
-                  },
-                  "overcommit": {
-                    "cpu": 10,
-                    "memory": 2
-                  }
-                }
-              }
-            ],
-            "required": [
-              "name",
-              "namespace",
-              "pod"
-            ],
-            "properties": {
-              "name": {
-                "$id": "#/properties/namespaces/items/anyOf/0/properties/name",
-                "type": "string",
-                "title": "The name schema",
-                "description": "An explanation about the purpose of this instance.",
-                "default": "",
-                "examples": [
-                  "staging"
-                ]
-              },
-              "namespace": {
-                "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace",
-                "type": "object",
-                "title": "The namespace schema",
-                "description": "An explanation about the purpose of this instance.",
-                "default": {},
-                "examples": [
-                  {
-                    "budget": {
-                      "cpu": 32,
-                      "memory": "64Gi",
-                      "storage": "500Gi"
-                    },
-                    "overcommit": {
-                      "cpu": 2,
-                      "memory": 1
-                    }
-                  }
-                ],
-                "required": [
-                  "budget",
-                  "overcommit"
-                ],
-                "properties": {
-                  "budget": {
-                    "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace/properties/budget",
-                    "type": "object",
-                    "title": "The budget schema",
-                    "description": "An explanation about the purpose of this instance.",
-                    "default": {},
-                    "examples": [
-                      {
-                        "cpu": 32,
-                        "memory": "64Gi",
-                        "storage": "500Gi"
-                      }
-                    ],
-                    "required": [
-                      "cpu",
-                      "memory",
-                      "storage"
-                    ],
-                    "properties": {
-                      "cpu": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace/properties/budget/properties/cpu",
-                        "type": "integer",
-                        "title": "The cpu schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": 0,
-                        "examples": [
-                          32
-                        ]
-                      },
-                      "memory": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace/properties/budget/properties/memory",
-                        "type": "string",
-                        "title": "The memory schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": "",
-                        "examples": [
-                          "64Gi"
-                        ]
-                      },
-                      "storage": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace/properties/budget/properties/storage",
-                        "type": "string",
-                        "title": "The storage schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": "",
-                        "examples": [
-                          "500Gi"
-                        ]
-                      }
-                    },
-                    "additionalProperties": true
-                  },
-                  "overcommit": {
-                    "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace/properties/overcommit",
-                    "type": "object",
-                    "title": "The overcommit schema",
-                    "description": "An explanation about the purpose of this instance.",
-                    "default": {},
-                    "examples": [
-                      {
-                        "cpu": 2,
-                        "memory": 1
-                      }
-                    ],
-                    "required": [
-                      "cpu",
-                      "memory"
-                    ],
-                    "properties": {
-                      "cpu": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace/properties/overcommit/properties/cpu",
-                        "type": "integer",
-                        "title": "The cpu schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": 0,
-                        "examples": [
-                          2
-                        ]
-                      },
-                      "memory": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/namespace/properties/overcommit/properties/memory",
-                        "type": "integer",
-                        "title": "The memory schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": 0,
-                        "examples": [
-                          1
-                        ]
-                      }
-                    },
-                    "additionalProperties": true
-                  }
-                },
-                "additionalProperties": true
-              },
-              "pod": {
-                "$id": "#/properties/namespaces/items/anyOf/0/properties/pod",
-                "type": "object",
-                "title": "The pod schema",
-                "description": "An explanation about the purpose of this instance.",
-                "default": {},
-                "examples": [
-                  {
-                    "limits": {
-                      "cpu": 4,
-                      "memory": "8Gi"
-                    },
-                    "defaults": {
-                      "cpu": "200m",
-                      "memory": "200Mi"
-                    },
-                    "overcommit": {
-                      "cpu": 10,
-                      "memory": 2
-                    }
-                  }
-                ],
-                "required": [
-                  "limits",
-                  "defaults",
-                  "overcommit"
-                ],
-                "properties": {
-                  "limits": {
-                    "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/limits",
-                    "type": "object",
-                    "title": "The limits schema",
-                    "description": "An explanation about the purpose of this instance.",
-                    "default": {},
-                    "examples": [
-                      {
-                        "cpu": 4,
-                        "memory": "8Gi"
-                      }
-                    ],
-                    "required": [
-                      "cpu",
-                      "memory"
-                    ],
-                    "properties": {
-                      "cpu": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/limits/properties/cpu",
-                        "type": "integer",
-                        "title": "The cpu schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": 0,
-                        "examples": [
-                          4
-                        ]
-                      },
-                      "memory": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/limits/properties/memory",
-                        "type": "string",
-                        "title": "The memory schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": "",
-                        "examples": [
-                          "8Gi"
-                        ]
-                      }
-                    },
-                    "additionalProperties": true
-                  },
-                  "defaults": {
-                    "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/defaults",
-                    "type": "object",
-                    "title": "The defaults schema",
-                    "description": "An explanation about the purpose of this instance.",
-                    "default": {},
-                    "examples": [
-                      {
-                        "cpu": "200m",
-                        "memory": "200Mi"
-                      }
-                    ],
-                    "required": [
-                      "cpu",
-                      "memory"
-                    ],
-                    "properties": {
-                      "cpu": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/defaults/properties/cpu",
-                        "type": "string",
-                        "title": "The cpu schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": "",
-                        "examples": [
-                          "200m"
-                        ]
-                      },
-                      "memory": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/defaults/properties/memory",
-                        "type": "string",
-                        "title": "The memory schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": "",
-                        "examples": [
-                          "200Mi"
-                        ]
-                      }
-                    },
-                    "additionalProperties": true
-                  },
-                  "overcommit": {
-                    "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/overcommit",
-                    "type": "object",
-                    "title": "The overcommit schema",
-                    "description": "An explanation about the purpose of this instance.",
-                    "default": {},
-                    "examples": [
-                      {
-                        "cpu": 10,
-                        "memory": 2
-                      }
-                    ],
-                    "required": [
-                      "cpu",
-                      "memory"
-                    ],
-                    "properties": {
-                      "cpu": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/overcommit/properties/cpu",
-                        "type": "integer",
-                        "title": "The cpu schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": 0,
-                        "examples": [
-                          10
-                        ]
-                      },
-                      "memory": {
-                        "$id": "#/properties/namespaces/items/anyOf/0/properties/pod/properties/overcommit/properties/memory",
-                        "type": "integer",
-                        "title": "The memory schema",
-                        "description": "An explanation about the purpose of this instance.",
-                        "default": 0,
-                        "examples": [
-                          2
-                        ]
-                      }
-                    },
-                    "additionalProperties": true
-                  }
-                },
-                "additionalProperties": true
-              }
-            },
-            "additionalProperties": true
-          }
-        ]
-      }
-    },
-    "namespace": {
-      "$id": "#/properties/namespace",
-      "type": "object",
-      "title": "The namespace schema",
-      "description": "An explanation about the purpose of this instance.",
-      "default": {},
-      "examples": [
-        {
-          "budget": {
-            "cpu": 32,
-            "memory": "64Gi",
-            "storage": "500Gi"
-          },
-          "overcommit": {
-            "cpu": 2,
-            "memory": 1
-          }
-        }
-      ],
-      "required": [
-        "budget",
-        "overcommit"
-      ],
-      "properties": {
-        "budget": {
-          "$id": "#/properties/namespace/properties/budget",
-          "type": "object",
-          "title": "The budget schema",
-          "description": "An explanation about the purpose of this instance.",
-          "default": {},
-          "examples": [
-            {
-              "cpu": 32,
-              "memory": "64Gi",
-              "storage": "500Gi"
-            }
-          ],
-          "required": [
-            "cpu",
-            "memory",
-            "storage"
-          ],
-          "properties": {
-            "cpu": {
-              "$id": "#/properties/namespace/properties/budget/properties/cpu",
-              "type": "integer",
-              "title": "The cpu schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": 0,
-              "examples": [
-                32
-              ]
-            },
-            "memory": {
-              "$id": "#/properties/namespace/properties/budget/properties/memory",
-              "type": "string",
-              "title": "The memory schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": "",
-              "examples": [
-                "64Gi"
-              ]
-            },
-            "storage": {
-              "$id": "#/properties/namespace/properties/budget/properties/storage",
-              "type": "string",
-              "title": "The storage schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": "",
-              "examples": [
-                "500Gi"
-              ]
-            }
-          },
-          "additionalProperties": true
-        },
-        "overcommit": {
-          "$id": "#/properties/namespace/properties/overcommit",
-          "type": "object",
-          "title": "The overcommit schema",
-          "description": "An explanation about the purpose of this instance.",
-          "default": {},
-          "examples": [
-            {
-              "cpu": 2,
-              "memory": 1
-            }
-          ],
-          "required": [
-            "cpu",
-            "memory"
-          ],
-          "properties": {
-            "cpu": {
-              "$id": "#/properties/namespace/properties/overcommit/properties/cpu",
-              "type": "integer",
-              "title": "The cpu schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": 0,
-              "examples": [
-                2
-              ]
-            },
-            "memory": {
-              "$id": "#/properties/namespace/properties/overcommit/properties/memory",
-              "type": "integer",
-              "title": "The memory schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": 0,
-              "examples": [
-                1
-              ]
-            }
-          },
-          "additionalProperties": true
-        }
-      },
-      "additionalProperties": true
-    },
-    "pod": {
-      "$id": "#/properties/pod",
-      "type": "object",
-      "title": "The pod schema",
-      "description": "An explanation about the purpose of this instance.",
-      "default": {},
-      "examples": [
-        {
-          "limits": {
-            "cpu": 4,
-            "memory": "8Gi"
-          },
-          "defaults": {
-            "cpu": "200m",
-            "memory": "200Mi"
-          },
-          "overcommit": {
-            "cpu": 10,
-            "memory": 2
-          }
-        }
-      ],
-      "required": [
-        "limits",
-        "defaults",
-        "overcommit"
-      ],
-      "properties": {
-        "limits": {
-          "$id": "#/properties/pod/properties/limits",
-          "type": "object",
-          "title": "The limits schema",
-          "description": "An explanation about the purpose of this instance.",
-          "default": {},
-          "examples": [
-            {
-              "cpu": 4,
-              "memory": "8Gi"
-            }
-          ],
-          "required": [
-            "cpu",
-            "memory"
-          ],
-          "properties": {
-            "cpu": {
-              "$id": "#/properties/pod/properties/limits/properties/cpu",
-              "type": "integer",
-              "title": "The cpu schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": 0,
-              "examples": [
-                4
-              ]
-            },
-            "memory": {
-              "$id": "#/properties/pod/properties/limits/properties/memory",
-              "type": "string",
-              "title": "The memory schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": "",
-              "examples": [
-                "8Gi"
-              ]
-            }
-          },
-          "additionalProperties": true
-        },
-        "defaults": {
-          "$id": "#/properties/pod/properties/defaults",
-          "type": "object",
-          "title": "The defaults schema",
-          "description": "An explanation about the purpose of this instance.",
-          "default": {},
-          "examples": [
-            {
-              "cpu": "200m",
-              "memory": "200Mi"
-            }
-          ],
-          "required": [
-            "cpu",
-            "memory"
-          ],
-          "properties": {
-            "cpu": {
-              "$id": "#/properties/pod/properties/defaults/properties/cpu",
-              "type": "string",
-              "title": "The cpu schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": "",
-              "examples": [
-                "200m"
-              ]
-            },
-            "memory": {
-              "$id": "#/properties/pod/properties/defaults/properties/memory",
-              "type": "string",
-              "title": "The memory schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": "",
-              "examples": [
-                "200Mi"
-              ]
-            }
-          },
-          "additionalProperties": true
-        },
-        "overcommit": {
-          "$id": "#/properties/pod/properties/overcommit",
-          "type": "object",
-          "title": "The overcommit schema",
-          "description": "An explanation about the purpose of this instance.",
-          "default": {},
-          "examples": [
-            {
-              "cpu": 10,
-              "memory": 2
-            }
-          ],
-          "required": [
-            "cpu",
-            "memory"
-          ],
-          "properties": {
-            "cpu": {
-              "$id": "#/properties/pod/properties/overcommit/properties/cpu",
-              "type": "integer",
-              "title": "The cpu schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": 0,
-              "examples": [
-                10
-              ]
-            },
-            "memory": {
-              "$id": "#/properties/pod/properties/overcommit/properties/memory",
-              "type": "integer",
-              "title": "The memory schema",
-              "description": "An explanation about the purpose of this instance.",
-              "default": 0,
-              "examples": [
-                2
-              ]
-            }
-          },
-          "additionalProperties": true
-        }
-      },
-      "additionalProperties": true
-    }
-  },
-  "additionalProperties": true
-}

charts/namespaces/values.yaml

@@ -1,40 +1 @@
-namespaces:
-  - name: staging
-    namespace:
-      budget:
-        cpu: 32
-        memory: "64Gi"
-        storage: "500Gi"
-      overcommit:
-        cpu: 2
-        memory: 1
-    pod:
-      limits:
-        cpu: 4
-        memory: "8Gi"
-      defaults:
-        cpu: "200m"
-        memory: "200Mi"
-      overcommit:
-        cpu: 10
-        memory: 2
-
-namespace:
-  budget:
-    cpu: 32
-    memory: "64Gi"
-    storage: "500Gi"
-  overcommit:
-    cpu: 2
-    memory: 1
-
-pod:
-  limits:
-    cpu: 4
-    memory: "8Gi"
-  defaults:
-    cpu: "200m"
-    memory: "200Mi"
-  overcommit:
-    cpu: 10
-    memory: 2
+namespaces: []

charts/onechart/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.1.0
-digest: sha256:636a65e9846bdff17cc4e65b0849061f783759a37aa51fb85ff6fd8ba5e68467
-generated: "2021-08-05T10:39:10.053810673+02:00"
+  version: 0.3.1
+digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681
+generated: "2023-08-18T08:31:18.469039683+02:00"

charts/onechart/Chart.yaml

@@ -15,9 +15,9 @@ 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.32.0
+version: 0.57.0
 
 dependencies:
   - name: common
-    version: 0.1.0
+    version: 0.3.1
     repository: file://../common

charts/onechart/helm-ui.json

@@ -19,8 +19,7 @@
     "schemaIDs": [
       "#/properties/resources"
     ],
-    "uiSchema": {
-    },
+    "uiSchema": {},
     "metaData": {
       "name": "Resources",
       "icon": "M9 7h6m0 10v-3m-3 3h.01M9 17h.01M9 14h.01M12 14h.01M15 11h.01M12 11h.01M9 11h.01M7 21h10a2 2 0 002-2V5a2 2 0 00-2-2H7a2 2 0 00-2 2v14a2 2 0 002 2z"
@@ -28,7 +27,8 @@
   },
   {
     "schemaIDs": [
-      "#/properties/probe"
+      "#/properties/probe",
+      "#/properties/livenessProbe"
     ],
     "uiSchema": {
       "#/properties/probe": {
@@ -49,6 +49,25 @@
             "ui:widget": "range"
           }
         }
+      },
+      "#/properties/livenessProbe": {
+        "settings": {
+          "initialDelaySeconds": {
+            "ui:widget": "range"
+          },
+          "periodSeconds": {
+            "ui:widget": "range"
+          },
+          "successThreshold": {
+            "ui:widget": "range"
+          },
+          "timeoutSeconds": {
+            "ui:widget": "range"
+          },
+          "failureThreshold": {
+            "ui:widget": "range"
+          }
+        }
       }
     },
     "metaData": {
@@ -74,6 +93,7 @@
   },
   {
     "schemaIDs": [
+      "#/properties/secretEnabled",
       "#/properties/sealedSecrets"
     ],
     "uiSchema": {
@@ -84,7 +104,7 @@
       }
     },
     "metaData": {
-      "name": "Sealed Secrets",
+      "name": "Secrets",
       "icon": "M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"
     }
   },
@@ -92,7 +112,18 @@
     "schemaIDs": [
       "#/properties/volumes"
     ],
-    "uiSchema": {},
+    "uiSchema": {
+      "#/properties/volumes": {
+        "items": {
+          "emptyDir": {
+            "ui:widget": "hidden"
+          },
+          "configMapValue": {
+            "ui:widget": "textarea"
+          }
+        }
+      }
+    },
     "metaData": {
       "name": "Volumes",
       "icon": "M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4"
@@ -104,7 +135,7 @@
     ],
     "uiSchema": {},
     "metaData": {
-      "name": "Host Names",
+      "name": "Ingress",
       "icon": "M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"
     }
   },
@@ -118,5 +149,17 @@
       "name": "High Availability",
       "icon": "M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z"
     }
+  },
+  {
+    "schemaIDs": [
+      "#/properties/podAnnotations",
+      "#/properties/gitSha",
+      "#/properties/gitRepository"
+    ],
+    "uiSchema": {},
+    "metaData": {
+      "name": "Misc",
+      "icon": "M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
+    }
   }
-]
+]

charts/onechart/templates/custom-file-configmap.yaml

@@ -0,0 +1 @@
+{{- include "common.customFileConfigmap.tpl" . -}}

charts/onechart/templates/deployment.yaml

@@ -5,10 +5,11 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "helm-chart.labels" . | nindent 4 }}
-  {{- if .Values.gitSha }}
   annotations:
+    kubectl.kubernetes.io/default-container: {{ template "robustName" .Release.Name }}
+    {{- if .Values.gitSha }}
     gimlet.io/git-sha: {{ .Values.gitSha }}
-  {{- end }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
@@ -49,6 +50,29 @@ spec:
       {{- if .Values.serviceAccount }}
       serviceAccountName: {{ .Values.serviceAccount }}
       {{- end }}
+      initContainers:
+        {{- range .Values.initContainers }}  
+        - name:  {{ .name }}
+          image: "{{ .image }}:{{ .tag }}"
+          imagePullPolicy: {{ .imagePullPolicy | default "IfNotPresent" }}
+          {{- if .command }}
+          command:
+            - {{ $.Values.shell }}
+            - -c
+            - {{ .command | quote}} 
+          {{- end }}
+          volumeMounts:
+          {{- range $.Values.volumes }}  
+          {{- if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
+          - mountPath: {{ .path }}
+            name: {{ .name }}
+          {{- end }}
+          {{- end }}
+          {{- if .securityContext }}
+          securityContext:
+          {{- toYaml .securityContext | nindent 12 }}
+          {{- end}}
+        {{- end }}      
       containers:
         - name: {{ template "robustName" .Release.Name }}
           securityContext: &securityContext
@@ -67,7 +91,7 @@ spec:
             - name: http
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
-            {{ else }}
+            {{- else }}
             {{- range .Values.ports }}
             - name: {{ .name }}
               containerPort: {{ .containerPort }}
@@ -95,8 +119,15 @@ spec:
             {{- end }}
           {{- end }}
           {{- include "common.volumeMountsRef.tpl" . | nindent 10 }}
+          {{- if not .Values.resources.ignore }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- if .Values.resources.ignoreLimits }}
+            requests:
+              {{- toYaml .Values.resources.requests | nindent 14 }}
+            {{- else }}
+             {{- toYaml .Values.resources | nindent 12 }}
+            {{- end }}
+          {{- end }}
         {{- if .Values.sidecar }}
         - name: {{ template "robustName" .Release.Name }}-sidecar
           securityContext: *securityContext

charts/onechart/templates/extraDeploy.yaml

@@ -0,0 +1,3 @@
+{{- if .Values.extraDeploy }}
+{{ .Values.extraDeploy }}
+{{- end }}

charts/onechart/templates/ingress.yaml

@@ -39,7 +39,7 @@ spec:
     - host: {{ .ingress.host | quote }}
       http:
         paths:
-          - path: "/"
+          - path: {{ .ingress.path | default  "/" | quote }}
             pathType: "Prefix"
             backend:
               service:

charts/onechart/templates/pdb.yaml

@@ -1,5 +1,5 @@
 {{- if and (.Values.podDisruptionBudgetEnabled) (gt (.Values.replicas | int64) 1) }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "robustName" .Release.Name }}

charts/onechart/templates/service.yaml

@@ -31,7 +31,7 @@ spec:
       {{- if .Values.nodePort }}
       nodePort: {{ .Values.nodePort }}
       {{- end }}
-    {{ else }}
+    {{- else }}
     {{- range .Values.ports }}
     - name: {{ .name }}
       port: {{ if .svcPort }}{{ .svcPort }}{{ else }}{{ .containerPort }}{{ end }}

charts/onechart/templates/servicemonitor.yaml

@@ -0,0 +1,42 @@
+{{ if .Values.monitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "robustName" .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "helm-chart.labels" . | nindent 4 }}
+  {{- if or .Values.gitRepository .Values.gitSha }}
+  annotations:
+    {{- if .Values.gitRepository }}
+    gimlet.io/git-repository: {{ .Values.gitRepository }}
+    {{- end }}
+    {{- if .Values.gitSha }}
+    gimlet.io/git-sha: {{ .Values.gitSha }}
+    {{- end }}
+  {{- end }}
+spec:
+  endpoints:
+  - interval: 60s
+    params:
+      format:
+      - prometheus
+    path: {{ default "/metrics" .Values.monitor.path }} 
+    {{ if .Values.monitor.portName }}
+    port: {{ .Values.monitor.portName }}
+    {{ else if not .Values.ports }}
+    port: http
+    {{ else }}
+    port: {{ index .Values.ports 0 "name" }}
+    {{ end }}
+    scheme: {{ default "http" .Values.monitor.scheme }}
+    {{ if .Values.monitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.monitor.scrapeTimeout }}
+    {{ end }}
+  namespaceSelector:
+    matchNames:
+    - "{{ .Release.Namespace }}"
+  selector:
+    matchLabels:
+        {{- include "helm-chart.selectorLabels" . | nindent 6 }}
+{{ end }}

charts/onechart/tests/custom_file_configmap_test.yaml

@@ -0,0 +1,22 @@
+suite: test deployment
+templates:
+  - custom-file-configmap.yaml
+tests:
+  - it: Should create configmaps for custom string files
+    set:
+      volumes:
+        - fileName: myFile.conf
+          fileContent: |
+              blablabla
+              bla
+          path: /randomPath/myFile.conf
+          subPath: myFile.conf
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: data
+          value:
+            myFile.conf: |
+              blablabla
+              bla

charts/onechart/tests/deployment_existing_file_secrets_test.yaml

@@ -0,0 +1,44 @@
+suite: test deployment
+templates:
+  - deployment.yaml
+  - configmap.yaml
+  - pvc.yaml
+tests:
+  - it: Should mount volume
+    set:
+      existingFileSecrets:
+        - name: my-existing-secret
+          path: /config
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+            - name: my-existing-secret
+              mountPath: /config
+              readOnly: true
+  - it: Should mount volume with optional subPath
+    set:
+      existingFileSecrets:
+        - name: my-existing-secret
+          path: /config/config.yaml
+          subPath: config.yml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+            - name: my-existing-secret
+              mountPath: /config/config.yaml
+              subPath: config.yml
+              readOnly: true
+  - it: Should reference volume
+    set:
+      existingFileSecrets:
+        - name: my-existing-secret
+          path: /config
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: my-existing-secret
+              secret:
+                secretName: my-existing-secret

charts/onechart/tests/deployment_file_secrets_test.yaml

@@ -18,6 +18,22 @@ tests:
             - name: google-account-key
               mountPath: /google-account-key
               readOnly: true
+  - it: Should mount volume with optional subPath
+    set:
+      fileSecrets:
+        - name: google-account-key
+          path: /config/google-account-key
+          subPath: google-account-key
+          secrets:
+            key.json: supersecret
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+            - name: google-account-key
+              mountPath: /config/google-account-key
+              subPath: google-account-key
+              readOnly: true
   - it: Should reference volume
     set:
       fileSecrets:

charts/onechart/tests/deployment_initcontainers_test.yaml

@@ -0,0 +1,38 @@
+suite: test deployment
+templates:
+  - deployment.yaml
+  - configmap.yaml
+tests:
+  - it: Should set name, image and tag  
+    set:
+      initContainers:
+          - name: pod1
+            image: nginx
+            tag: 1.2.2
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: pod1
+      - equal:
+          path: spec.template.spec.initContainers[0].image
+          value: "nginx:1.2.2"
+  - it: Should set command  
+    set:
+      initContainers:
+          - command: "while true; do date; sleep 2; done &&
+                      ls /data &&
+                      printf something"
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].command
+          value: ['/bin/sh', '-c', 'while true; do date; sleep 2; done && ls /data && printf something']
+
+  - it: Should set security context
+    set:
+      initContainers:
+          - securityContext:
+              runAsNonRoot: true
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].securityContext.runAsNonRoot
+          value: true

charts/onechart/tests/deployment_resources_test.yaml

@@ -0,0 +1,40 @@
+suite: test deployment
+templates:
+  - deployment.yaml
+  - configmap.yaml
+tests:
+  - it: Should render resoucres if not ignored by default
+    set:
+      {}
+    asserts:
+      - isNotNull:
+          path: spec.template.spec.containers[0].resources
+  - it: Should ignore resources if ignore flag is set
+    set:
+      resources:
+        ignore: true
+    asserts:
+      - isNull:
+          path: spec.template.spec.containers[0].resources
+  - it: Should ignore resources limits when ignoreLimits flag is set
+    set:
+      resources:
+        ignoreLimits: true
+    asserts:
+      - isNull:
+          path: spec.template.spec.containers[0].resources.limits
+      - isNotNull:
+          path: spec.template.spec.containers[0].resources.requests
+  - it: Should create requests when ignoreLimits flag is set
+    set:
+      resources:
+        ignoreLimits: true
+        requests:
+          cpu: "1000m"
+          memory: "200Mi"
+    asserts:
+      - isNotNull:
+          path: spec.template.spec.containers[0].resources.requests
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 1000m

charts/onechart/tests/deployment_volumes_test.yaml

@@ -74,3 +74,148 @@ tests:
             - name: data
               persistentVolumeClaim:
                 claimName: my-static-claim
+  - it: Should use emptyDir
+    set:
+      volumes:
+        - name: data
+          path: /var/lib/1clickinfra/data
+          emptyDir: true
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: data
+              emptyDir: {}
+  - it: Should use hostPath
+    set:
+      volumes:
+        - name: data
+          path: /var/lib/1clickinfra/data
+          hostPath:
+            path: /somewhere/over/the/rainbow
+            type: DirectoryOrCreate
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: data
+              hostPath:
+                path: /somewhere/over/the/rainbow
+                type: DirectoryOrCreate
+  - it: Should use hostPath without type
+    set:
+      volumes:
+        - name: data
+          path: /var/lib/1clickinfra/data
+          hostPath:
+            path: /somewhere/over/the/rainbow
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: data
+              hostPath:
+                path: /somewhere/over/the/rainbow
+  - it: Should use emptyDir
+    set:
+      volumes:
+        - name: myScratchDisk
+          path: /randomPath
+          emptyDir: true
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: myScratchDisk
+              emptyDir: {}
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+            - name: myScratchDisk
+              mountPath: /randomPath
+  - it: Should use a configMap
+    set:
+      volumes:
+        - existingConfigMap: my-configmap
+          name: volume-name
+          path: /randomPath/app.conf
+          subPath: app.conf
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: volume-name
+              configMap:
+                name: my-configmap
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+            - name: volume-name
+              mountPath: /randomPath/app.conf
+              subPath: app.conf
+  - it: Should use a configmap with custom value
+    set:
+      volumes:
+        - name: volume-name
+          fileName: myfile.conf
+          fileContent: |
+              blablabla
+              bla
+          path: /randomPath/myfile.conf
+          subPath: myfile.conf
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: volume-name
+              configMap:
+                name: myfile-conf
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+            - name: volume-name
+              mountPath: /randomPath/myfile.conf
+              subPath: myfile.conf
+  - it: Should mount a volume only for the init container
+    set:
+      initContainers:
+        - name : pod
+      volumes:
+        - name: init-volume
+          path: /data
+          emptyDir: true
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes
+          value:
+          - name: init-volume
+            emptyDir: {} 
+      - equal: 
+          path: spec.template.spec.initContainers[0].volumeMounts
+          value:
+          - name: init-volume
+            mountPath: /data 
+      - notEqual:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+          - name: init-volume
+            emptyDir: {}
+  - it: Should mount a shared volume between the main container and the init container
+    set:
+      initContainers:
+        - name: pod
+      volumes:
+        - name: shared-volume
+          path: /data
+          emptyDir: true
+    asserts:
+      - equal: 
+          path: spec.template.spec.initContainers[0].volumeMounts
+          value:
+          - name: shared-volume
+            mountPath: /data
+      - equal: 
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+          - name: shared-volume
+            mountPath: /data      

charts/onechart/tests/extraDeploy_test.yaml

@@ -0,0 +1,57 @@
+suite: test service
+templates:
+  - extraDeploy.yaml
+tests:
+  - it: Should include additional yaml pieces
+    set:
+      extraDeploy: |
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        metadata:
+          name: test-network-policy
+          namespace: default
+        spec:
+          podSelector:
+            matchLabels:
+              role: db
+          policyTypes:
+            - Ingress
+            - Egress
+          ingress:
+            - from:
+                - ipBlock:
+                    cidr: 172.17.0.0/16
+                    except:
+                      - 172.17.1.0/24
+                - namespaceSelector:
+                    matchLabels:
+                      project: myproject
+                - podSelector:
+                    matchLabels:
+                      role: frontend
+              ports:
+                - protocol: TCP
+                  port: 6379
+          egress:
+            - to:
+                - ipBlock:
+                    cidr: 10.0.0.0/24
+              ports:
+                - protocol: TCP
+                  port: 5978
+    asserts:
+      - equal:
+          path: kind
+          value: NetworkPolicy
+  - it: Should include multiple yaml pieces
+    set:
+      extraDeploy: |
+        ---
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        ---
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+    asserts:
+      - hasDocuments:
+          count: 2

charts/onechart/tests/ingress_path_test.yaml

@@ -0,0 +1,21 @@
+suite: test ingress
+templates:
+  - ingress.yaml
+tests:
+  - it: Should default
+    set:
+      ingress:
+        host: chart-example.local
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/"
+  - it: Should use path
+    set:
+      ingress:
+        host: chart-example.local
+        path: "/mypath"
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/mypath"

charts/onechart/tests/pvc_test.yaml

@@ -13,6 +13,20 @@ tests:
       - equal:
           path: spec.storageClassName
           value: default
+  - it: Should assign annotations to the PVC
+    set:
+      volumes:
+        - name: data
+          path: /var/lib/1clickinfra/data
+          size: 10Gi
+          storageClass: default
+          pvcAnnotations:
+            rancher.io/local-path/volume-type: local
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            rancher.io/local-path/volume-type: local
   - it: Should not generate a claim when using existing claim
     set:
       volumes:
@@ -22,3 +36,13 @@ tests:
     asserts:
       - hasDocuments:
           count: 0
+  - it: Should not generate a claim when using host path
+    set:
+      volumes:
+        - name: data
+          path: /var/lib/1clickinfra/data
+          hostPath:
+            path: /data/test
+    asserts:
+      - hasDocuments:
+          count: 0

charts/onechart/values.schema.json

@@ -84,6 +84,53 @@
         }
       }
     },
+    "initContainers": {
+      "$id": "#/properties/initcontainers",
+      "type": "array",
+      "title": "Init Containers",
+      "default": [],
+      "additionalItems": true,
+      "items": {
+        "$id": "#/properties/initcontainers/items",
+        "type": "object",
+        "anyOf": [
+          {
+            "id": "#/properties/volumes/oneOf/0",
+            "title": "InitContainer",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "title": "Name",
+                "description": "The name of the init container"
+              },
+              "image": {
+                "type": "string",
+                "title": "Image"
+              },
+              "tag": {
+                "type": "string",
+                "title": "Tag"
+              },
+              "imagePullPolicy": {
+                "type": "string",
+                "title": "Command",
+                "default": "IfNotPresent"
+              },
+              "command": {
+                "type": "string",
+                "title": "Command"
+              }
+            },
+            "required": [
+              "name",
+              "image",
+              "tag"
+            ]
+          }
+        ]
+      }
+    },
     "replicas": {
       "$id": "#/properties/replicas",
       "type": "integer",
@@ -133,8 +180,8 @@
     "podAnnotations": {
       "$id": "#/properties/podAnnotations",
       "type": "object",
-      "title": "The podAnnotations schema",
-      "description": "An explanation about the purpose of this instance.",
+      "title": "Pod annotations",
+      "description": "Annotations to place on pods",
       "default": {},
       "examples": [
         {}
@@ -142,6 +189,20 @@
       "required": [],
       "additionalProperties": true
     },
+    "gitSha": {
+      "$id": "#/properties/gitSha",
+      "type": "string",
+      "title": "Commit Hash",
+      "description": "The git hash that you are deploying",
+      "default": ""
+    },
+    "gitRepository": {
+      "$id": "#/properties/gitRepository",
+      "type": "string",
+      "title": "GitHub Repository",
+      "description": "The git repository that you are deploying",
+      "default": ""
+    },
     "podSecurityContext": {
       "$id": "#/properties/podSecurityContext",
       "type": "object",
@@ -212,6 +273,26 @@
       ],
       "required": [],
       "properties": {
+        "ignore": {
+          "$id": "#/properties/resources/properties/ignore",
+          "type": "boolean",
+          "title": "Ignore",
+          "description": "If set to true, resource configuration will be ignored",
+          "default": false,
+          "examples": [
+            true
+          ]
+        },
+        "ignoreLimits": {
+          "$id": "#/properties/resources/properties/ignoreLimits",
+          "type": "boolean",
+          "title": "Ignore limits",
+          "description": "If set to true, limits in resource configuration will be ignored",
+          "default": false,
+          "examples": [
+            true
+          ]
+        },
         "requests": {
           "$id": "#/properties/resources/properties/requests",
           "type": "object",
@@ -334,7 +415,7 @@
       "$id": "#/properties/probe",
       "type": "object",
       "title": "Healthcheck",
-      "description": "The Kubernetes Readiness probe that determines whether your app is healthy and if should receive traffic",
+      "description": "The Kubernetes Readiness probe determines whether your app is healthy and if it should receive traffic",
       "default": {},
       "examples": [
         {
@@ -385,10 +466,10 @@
               "$id": "#/properties/probe/properties/settings/properties/initialDelaySeconds",
               "type": "integer",
               "title": "Initial Delay Seconds",
-              "description": "Number of seconds after the container has started before the probes is initiated",
+              "description": "Number of seconds after the container has started before the probe is initiated",
               "default": 0,
               "minimum": 0,
-              "maximum": 60
+              "maximum": 180
             },
             "periodSeconds": {
               "$id": "#/properties/probe/properties/settings/properties/periodSeconds",
@@ -421,7 +502,107 @@
               "$id": "#/properties/probe/properties/settings/properties/failureThreshold",
               "type": "integer",
               "title": "Failure Threshold",
-              "description": "When a probe fails, Kubernetes will tries this many times before giving up. Giving up the pod will be marked Unready and won't get any traffic",
+              "description": "When a probe fails, Kubernetes will try this many times before giving up. Giving up the pod will be marked Unready and won't get any traffic",
+              "default": 3,
+              "minimum": 1,
+              "maximum": 15
+            }
+          }
+        }
+      }
+    },
+    "livenessProbe": {
+      "$id": "#/properties/livenessProbe",
+      "type": "object",
+      "title": "Liveness check",
+      "description": "The Kubernetes Liveness probe determines whether your app is healthy and if it should be restarted",
+      "default": {},
+      "examples": [
+        {
+          "enabled": false,
+          "path": "/"
+        }
+      ],
+      "required": [
+        "enabled",
+        "path"
+      ],
+      "properties": {
+        "enabled": {
+          "$id": "#/properties/livenessProbe/properties/enabled",
+          "type": "boolean",
+          "title": "",
+          "description": "",
+          "default": false,
+          "examples": [
+            false
+          ]
+        },
+        "path": {
+          "$id": "#/properties/livenessProbe/properties/path",
+          "type": "string",
+          "title": "Path",
+          "description": "Fill in the description",
+          "default": "/",
+          "examples": [
+            "/"
+          ]
+        },
+        "settings": {
+          "$id": "#/properties/livenessProbe/properties/settings",
+          "type": "object",
+          "title": "Probe thresholds",
+          "description": "Tune the probe behavior",
+          "examples": [
+            {
+              "failureThreshold": 3,
+              "periodSeconds": 10,
+              "successThreshold": 1,
+              "timeoutSeconds": 10
+            }
+          ],
+          "properties": {
+            "initialDelaySeconds": {
+              "$id": "#/properties/livenessProbe/properties/settings/properties/initialDelaySeconds",
+              "type": "integer",
+              "title": "Initial Delay Seconds",
+              "description": "Number of seconds after the container has started before the probe is initiated",
+              "default": 0,
+              "minimum": 0,
+              "maximum": 180
+            },
+            "periodSeconds": {
+              "$id": "#/properties/livenessProbe/properties/settings/properties/periodSeconds",
+              "type": "integer",
+              "title": "Period",
+              "description": "How often (in seconds) to perform the probe",
+              "default": 10,
+              "minimum": 1,
+              "maximum": 60
+            },
+            "successThreshold": {
+              "$id": "#/properties/livenessProbe/properties/settings/properties/successThreshold",
+              "type": "integer",
+              "title": "Success Threshold",
+              "description": "Minimum consecutive successes for the probe to be considered successful after having failed",
+              "default": 1,
+              "minimum": 1,
+              "maximum": 15
+            },
+            "timeoutSeconds": {
+              "$id": "#/properties/livenessProbe/properties/settings/properties/timeoutSeconds",
+              "type": "integer",
+              "title": "Timeout",
+              "description": "Number of seconds after which the probe times out",
+              "default": 3,
+              "minimum": 1,
+              "maximum": 30
+            },
+            "failureThreshold": {
+              "$id": "#/properties/livenessProbe/properties/settings/properties/failureThreshold",
+              "type": "integer",
+              "title": "Failure Threshold",
+              "description": "When a probe fails, Kubernetes will try this many times before giving up. Giving up the pod will be marked Unready and won't get any traffic",
               "default": 3,
               "minimum": 1,
               "maximum": 15
@@ -484,10 +665,17 @@
       "properties": {},
       "additionalProperties": true
     },
+    "secretEnabled": {
+      "$id": "#/properties/secretEnabled",
+      "type": "boolean",
+      "title": "Existing secret",
+      "description": "If enabled, a secret will be referenced from the deployment whose name matches the deployment name",
+      "default": false
+    },
     "sealedSecrets": {
       "$id": "#/properties/sealedSecrets",
       "type": "object",
-      "title": "Sealed Secrets",
+      "title": "Sealed secrets",
       "description": "",
       "default": {},
       "examples": [
@@ -527,6 +715,16 @@
             "my-release.mycompany.com"
           ]
         },
+        "path": {
+          "$id": "#/properties/ingress/properties/ingressPath",
+          "type": "string",
+          "title": "Path",
+          "description": "The API path where your service is accessible",
+          "default": "/",
+          "examples": [
+            "/api/myservice"
+          ]
+        },
         "tlsEnabled": {
           "$id": "#/properties/ingress/properties/tlsEnabled",
           "type": "boolean",
@@ -541,7 +739,7 @@
           "$id": "#/properties/ingress/properties/annotations",
           "type": "object",
           "title": "Annotations",
-          "description": "",
+          "description": "Annotations are used to control ingress behavior. See the full list for the Ingress Nginx project at https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/. Use the `cert-manager.io/cluster-issuer:\"letsencrypt\"` one to request TLS certificates, `kubernetes.io/ingress.class: \"nginx\"` to select an ingress controller.",
           "default": {},
           "examples": [
             {
@@ -552,6 +750,49 @@
         }
       }
     },
+    "existingFileSecrets": {
+      "$id": "#/properties/existingFileSecrets",
+      "type": "array",
+      "title": "Existing file secrets",
+      "description": "Allows to mount existing secrets into a container",
+      "default": [],
+      "additionalItems": true,
+      "items": {
+        "$id": "#/properties/existingFileSecrets/items",
+        "type": "object",
+        "anyOf": [
+          {
+            "id": "#/properties/existingFileSecrets/oneOf/0",
+            "title": "existingFileSecrets",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "title": "Name",
+                "description": "The name of the existing secret to mount",
+                "default": "data"
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data"
+              },
+              "subPath": {
+                "type": "string",
+                "title": "SubPath",
+                "description": "The optinal mount subpath inside the container, to only mount a specific file but not a complete directory.",
+                "default": "config.yaml"
+              }
+            },
+            "required": [
+              "name",
+              "path"
+            ]
+          }
+        ]
+      }
+    },
     "volumes": {
       "$id": "#/properties/volumes",
       "type": "array",
@@ -561,38 +802,221 @@
       "items": {
         "$id": "#/properties/volumes/items",
         "type": "object",
-        "properties": {
-          "name": {
-            "$id": "#/properties/volumes/items/anyOf/0/properties/name",
-            "type": "string",
-            "title": "Name",
-            "description": "The name of the volume. Used only to recognize the volumes purpose in the config later on",
-            "default": "data"
+        "anyOf": [
+          {
+            "id": "#/properties/volumes/oneOf/0",
+            "title": "Volume",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "title": "Name",
+                "description": "The name of the volume. Used only to recognize the volumes purpose in the config later on",
+                "default": "data"
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data"
+              },
+              "size": {
+                "type": "string",
+                "title": "Size",
+                "description": "eg: 10Gi"
+              },
+              "storageClass": {
+                "type": "string",
+                "title": "Storage Class",
+                "description": "The slug indicating the disk type in your cloud provider. `standard` on Google Cloud, `default` on Azure; `do-block-storage` on Digital Ocean"
+              },
+              "pvcAnnotations": {
+                "type": "object",
+                "title": "Annotations",
+                "description": "Annotations are used to control the persistance claim behavior.",
+                "default": {},
+                "examples": [
+                  {
+                    "rancher.io/local-path/volume-type": "local"
+                  }
+                ],
+                "additionalProperties": true
+              }
+            },
+            "required": [
+              "name",
+              "path",
+              "size"
+            ]
           },
-          "path": {
-            "$id": "#/properties/volumes/items/anyOf/0/properties/path",
-            "type": "string",
-            "title": "Path",
-            "description": "The mount path inside the container",
-            "default": "/data"
+          {
+            "id": "#/properties/volumes/oneOf/1",
+            "title": "Use an existing volume claim",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "title": "Name",
+                "description": "The name of the volume. Used only to recognize the volumes purpose in the config later on",
+                "default": "data"
+              },
+              "existingClaim": {
+                "type": "string",
+                "title": "Existing Claim",
+                "description": "Use an existing PersistentVolumeClaim"
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data"
+              }
+            },
+            "required": [
+              "name",
+              "path",
+              "existingClaim"
+            ]
           },
-          "size": {
-            "$id": "#/properties/volumes/items/anyOf/0/properties/size",
-            "type": "string",
-            "title": "Size",
-            "description": "",
-            "default": "10Gi"
+          {
+            "id": "#/properties/volumes/oneOf/2",
+            "title": "Use a path from the host",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "title": "Name",
+                "description": "The name of the volume. Used only to recognize the volumes purpose in the config later on",
+                "default": "data"
+              },
+              "hostPath": {
+                "type": "object",
+                "title": "Path on the host",
+                "description": "Use a physical path on the host machine",
+                "properties": {
+                  "path": {
+                    "type": "string",
+                    "title": "Path on Host",
+                    "description": "Use a physical path on the host machine"
+                  },
+                  "type": {
+                    "type": "string",
+                    "title": "Path Type",
+                    "enum": [
+                      "DirectoryOrCreate",
+                      "Directory",
+                      "FileOrCreate",
+                      "File",
+                      "Socket",
+                      "CharDevice",
+                      "BlockDevice"
+                    ]
+                  }
+                },
+                "required": [
+                  "path"
+                ]
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data"
+              }
+            },
+            "required": [
+              "name",
+              "path",
+              "hostPath"
+            ]
           },
-          "storageClass": {
-            "$id": "#/properties/volumes/items/anyOf/0/properties/storageClass",
-            "type": "string",
-            "title": "Storage Class",
-            "description": "The slug indicating the disk type in your cloud provider. `standard` on Google Cloud, `default` on Azure; `do-block-storage` on Digital Ocean",
-            "default": ""
+          {
+            "id": "#/properties/volumes/oneOf/3",
+            "title": "Use an ephemeral volume",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "title": "Name",
+                "default": "ephemeral-volume"
+              },
+              "emptyDir": {
+                "type": "boolean",
+                "title": "ephemeral volume (emptyDir)",
+                "description": "Enable to use a non-persistent disk",
+                "default": true
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data"
+              }
+            },
+            "required": [
+              "name",
+              "emptyDir",
+              "path"
+            ]
+          },
+          {
+            "id": "#/properties/volumes/oneOf/4",
+            "title": "Mount an existing configMap as a file",
+            "type": "object",
+            "properties": {
+              "existingConfigMap": {
+                "type": "string",
+                "title": "Name",
+                "description": "The name of the configMap to mount",
+                "default": "data"
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data/dummy.conf"
+              },
+              "subPath": {
+                "type": "string",
+                "title": "subPath",
+                "description": "Mount single file",
+                "default": "dummy.conf"
+              }
+            },
+            "required": [
+              "existingConfigMap",
+              "path"
+            ]
+          },
+          {
+            "id": "#/properties/volumes/oneOf/5",
+            "title": "Custom string to mount as a file",
+            "type": "object",
+            "properties": {
+              "fileName": {
+                "type": "string",
+                "title": "File name"
+              },
+              "fileContent": {
+                "type": "string",
+                "title": "File content"
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data"
+              }
+            },
+            "required": [
+              "fileName",
+              "fileContent",
+              "path"
+            ]
           }
-        }
+        ]
       }
     }
   },
   "additionalProperties": true
-}
+}

charts/onechart/values.yaml

@@ -3,6 +3,16 @@ image:
   tag: "latest"
   pullPolicy: IfNotPresent
 
+# ingress:
+#   host: chart-example.local
+#   ingressClassName: nginx
+#   tlsEnabled: true
+#   annotations:
+#     cert-manager.io/cluster-issuer: letsencrypt-staging
+
+# vars:
+#   MY_VAR: "value"
+
 replicas: 1
 
 nameOverride: ""
@@ -59,3 +69,7 @@ podDisruptionBudgetEnabled: true
 spreadAcrossNodes: false
 
 nodePortEnabled: false
+
+# Set true to enable service monitor.
+monitor:
+  enabled: false

charts/static-site/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/static-site/Chart.yaml

@@ -0,0 +1,18 @@
+apiVersion: v2
+name: static-site
+description: Chart to build and deploy static sites
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+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.57.0
+

charts/static-site/helm-ui.json

@@ -0,0 +1,30 @@
+[
+  {
+    "schemaIDs": [
+      "#/properties/gitCloneUrl",
+      "#/properties/buildImage",
+      "#/properties/buildScript",
+      "#/properties/builtAssets"
+    ],
+    "uiSchema": {
+      "#/properties/buildScript": {
+        "ui:widget": "textarea",
+        "ui:rows": 10
+      }
+    },
+    "metaData": {
+      "name": "Build",
+      "icon": "M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
+    }
+  },
+  {
+    "schemaIDs": [
+      "#/properties/ingress"
+    ],
+    "uiSchema": {},
+    "metaData": {
+      "name": "Ingress",
+      "icon": "M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"
+    }
+  }
+]

charts/static-site/templates/NOTES.txt

@@ -0,0 +1 @@
+

charts/static-site/templates/_helpers.tpl

@@ -0,0 +1,71 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "staticSite.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "staticSite.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "staticSite.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "staticSite.labels" -}}
+helm.sh/chart: {{ include "staticSite.chart" . }}
+{{ include "staticSite.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "staticSite.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "staticSite.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "staticSite.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "staticSite.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create robustName that can be used as Kubernetes resource name, and as subdomain as well
+\w – Latin letters, digits, underscore '_' .
+\W – all but \w .
+*/}}
+{{- define "robustName" -}}
+{{ regexReplaceAll "\\W+" . "-" | replace "_" "-" | lower | trunc 63 | trimSuffix "-" }}
+{{- end }}

charts/static-site/templates/deployment.yaml

@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "robustName" .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "staticSite.labels" . | nindent 4 }}
+  {{- if or .Values.gitRepository .Values.gitSha }}
+  annotations:
+    {{- if .Values.gitRepository }}
+    gimlet.io/git-repository: {{ .Values.gitRepository }}
+    {{- end }}
+    {{- if .Values.gitSha }}
+    gimlet.io/git-sha: {{ .Values.gitSha }}
+    {{- end }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "staticSite.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "staticSite.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.serviceAccount }}
+      serviceAccountName: {{ .Values.serviceAccount }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }} 
+      volumes:
+      - name: static-files
+        emptyDir: {}  
+      initContainers:
+      - name: init-con
+        image: {{ .Values.buildImage }}
+        {{- if .Values.buildScript }}
+        command:
+        - sh 
+        - -c 
+        - |
+           git clone {{ .Values.gitCloneUrl}} &&
+           cd {{ regexFind "([^\\/]+$)" .Values.gitCloneUrl | replace ".git" "" }} &&
+           {{ .Values.buildScript | nindent 12}}
+           mkdir -p /usr/share/nginx/html &&
+           cp -r ./{{ .Values.builtAssets }}. /usr/share/nginx/html
+        {{- end }}
+        volumeMounts:
+        - name: static-files
+          mountPath: /usr/share/nginx/html   
+      containers:
+        - name: {{ template "robustName" .Release.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+          - name: static-files
+            mountPath: /usr/share/nginx/html
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP

charts/static-site/templates/ingress.yaml

@@ -0,0 +1,52 @@
+{{/* OneChart ingress snippet */}}
+{{- define "onechart.ingress" }}
+{{- $robustName := include "robustName" .root.Release.Name -}}
+{{- $resourceName := $robustName -}}
+{{- if .longName }}
+{{- $resourceName = printf "%s-%s" $robustName (include "robustName" .ingress.host) -}}
+{{- end }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:  
+  name: {{ $resourceName }}
+  namespace: {{ .root.Release.Namespace }}
+  labels:
+    {{- include "staticSite.labels" .root | nindent 4 }}
+  {{- if or (or .root.Values.gitSha .ingress.annotations) .root.Values.gitRepository }}
+  annotations:
+    {{- if .ingress.annotations }}
+      {{- toYaml .ingress.annotations | nindent 4 }}
+    {{- end }}
+  {{- end }}
+spec:
+  {{- if .ingress.ingressClassName }}
+  ingressClassName: {{ .ingress.ingressClassName }}
+  {{- end }}
+  {{- if default false .ingress.tlsEnabled }}
+  tls:
+    - hosts:
+        - {{ .ingress.host | quote }}
+      secretName: {{ printf "tls-%s" $resourceName }}
+  {{- end }}
+  rules:
+    - host: {{ .ingress.host | quote }}
+      http:
+        paths:
+          - path: {{ .ingress.path | default  "/" | quote }}
+            pathType: "Prefix"
+            backend:
+              service:
+                name: {{ $robustName }}
+                port:
+                  number: {{ .root.Values.service.port }}
+{{- end }}
+
+{{- with .Values.ingress }}
+  {{- template "onechart.ingress" (dict "root" $ "ingress" .) }}
+{{- end }}
+
+{{- range .Values.ingresses }}
+{{template "onechart.ingress" (dict "root" $ "ingress" . "longName" true) }}
+{{- end }}
+ 

charts/static-site/templates/service.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "robustName" .Release.Name  }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "staticSite.labels" . | nindent 4 }}
+  {{- if or .Values.gitRepository .Values.gitSha }}
+  annotations:
+    {{- if .Values.gitRepository }}
+    gimlet.io/git-repository: {{ .Values.gitRepository }}
+    {{- end }}
+    {{- if .Values.gitSha }}
+    gimlet.io/git-sha: {{ .Values.gitSha }}
+    {{- end }}
+  {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "staticSite.selectorLabels" . | nindent 4 }}

charts/static-site/tests/deployment_test.yaml

@@ -0,0 +1,12 @@
+suite: test deployment
+templates:
+  - deployment.yaml
+tests:
+  - it: Should set image, tag and command
+    set:
+      gitCloneUrl: https:/github.com/mycompany/myrepo.git
+      buildImage: nginx:x.y.z
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].image
+          value: nginx:x.y.z

charts/static-site/tests/ingress_domain_test.yaml

@@ -0,0 +1,120 @@
+suite: test deployment
+templates:
+  - ingress.yaml
+tests:
+  - it: Should set Ingress host name
+    set:
+      ingress:
+        host: chart-example.local
+        tlsEnabled: true
+    asserts:
+      - equal:
+          path: spec.tls
+          value:
+            - hosts:
+                - chart-example.local
+              secretName: tls-release-name
+      - equal:
+          path: spec.rules
+          value:
+            - host: chart-example.local
+              http:
+                paths:
+                  - path: "/"
+                    pathType: "Prefix"
+                    backend:
+                      service:
+                        name: release-name
+                        port:
+                          number: 80
+  - it: Should pass ingress host name as is, user must sanitize it
+    set:
+      ingress:
+        host: feature/my_branch.local
+        tlsEnabled: true
+    asserts:
+      - equal:
+          path: spec.tls
+          value:
+            - hosts:
+                - feature/my_branch.local
+              secretName: tls-release-name
+      - equal:
+          path: spec.rules
+          value:
+            - host: feature/my_branch.local
+              http:
+                paths:
+                  - path: "/"
+                    pathType: "Prefix"
+                    backend:
+                      service:
+                        name: release-name
+                        port:
+                          number: 80
+  - it: Should set Ingress annotation
+    set:
+      ingress:
+        host: chart-example.local
+        annotations:
+          just/a-random: annotation
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            just/a-random: annotation
+  - it: Should set ingress class
+    set:
+      ingress:
+        host: chart-example.local
+        ingressClassName: nginx
+    asserts:
+      - equal:
+          path: spec.ingressClassName
+          value: nginx
+  - it: Should generate multiple ingresses
+    set:
+      ingresses:
+      - host: chart-example.local
+        annotations:
+          kubernetes.io/ingress.class: nginx
+      - host: another.local
+        annotations:
+          kubernetes.io/ingress.class: nginx
+    asserts:
+      - hasDocuments:
+          count: 2
+  - it: Should generate multiple ingresses
+    set:
+      ingress:
+        host: chart-example.local
+        annotations:
+          kubernetes.io/ingress.class: nginx
+      ingresses:
+        - host: chart-example.local
+          annotations:
+            kubernetes.io/ingress.class: nginx
+        - host: another.local
+          annotations:
+            kubernetes.io/ingress.class: nginx
+    asserts:
+      - hasDocuments:
+          count: 3
+  - it: Should have unique TLS secret names
+    set:
+      ingresses:
+        - host: chart-example.local
+          tlsEnabled: true
+          annotations:
+            kubernetes.io/ingress.class: nginx
+        - host: another.local
+          tlsEnabled: true
+          annotations:
+            kubernetes.io/ingress.class: nginx
+    asserts:
+      - equal:
+          path: spec.tls
+          value:
+            - hosts:
+                - chart-example.local
+              secretName: tls-release-name-chart-example-local

charts/static-site/tests/ingress_path_test.yaml

@@ -0,0 +1,21 @@
+suite: test ingress
+templates:
+  - ingress.yaml
+tests:
+  - it: Should default
+    set:
+      ingress:
+        host: chart-example.local
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/"
+  - it: Should use path
+    set:
+      ingress:
+        host: chart-example.local
+        path: "/mypath"
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/mypath"

charts/static-site/tests/ingress_port_test.yaml

@@ -0,0 +1,12 @@
+suite: test deployment
+templates:
+  - ingress.yaml
+tests:
+  - it: Should use service port
+    set:
+      ingress:
+        host: chart-example.local
+      asserts:
+        - equal:
+            path: spec.rules[0].http.paths[0].backend.service.port.number
+            value: 1234

charts/static-site/values.schema.json

@@ -0,0 +1,116 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "http://example.com/example.json",
+  "type": "object",
+  "title": "The root schema",
+  "description": "The root schema comprises the entire JSON document.",
+  "default": {},
+  "examples": [
+    {
+      "gitCloneUrl": "https://github.com/gimlet-io/hugo-site.git",
+      "buildImage": "node:latest",
+      "buildScript": "npm install && npm install -g gatsby-cli && gatsby build",
+      "builtAssets": "public/"
+    }
+  ],
+  "required": [
+    "gitCloneUrl",
+    "buildImage",
+    "buildScript",
+    "builtAssets"
+  ],
+  "properties": {
+    "gitCloneUrl": {
+      "$id": "#/properties/gitCloneUrl",
+      "type": "string",
+      "title": "Repo url",
+      "description": "The static site's git repository",
+      "default": "https://github.com/gimlet-io/reactjs-test-app.git"
+    },
+    "buildImage": {
+      "$id": "#/properties/buildImage",
+      "type": "string",
+      "title": "Build image",
+      "description": "The image that will be used for the build proccess",
+      "default": "node:latest"
+    },
+    "buildScript": {
+      "$id": "#/properties/buildScript",
+      "type": "string",
+      "title": "Build script",
+      "description": "Commands required for the build to be completed",
+      "default": "# !/usr/bin/env bash\n\nnpm install\nnpm run build"
+
+    },
+    "builtAssets": {
+      "$id": "#/properties/builtAssets",
+      "type": "string",
+      "title": "Built assets",
+      "description": "The folder containing the build's generated files",
+      "default": "build/"
+    },
+    "ingress": {
+      "$id": "#/properties/ingress",
+      "type": "object",
+      "title": "Incoming traffic",
+      "description": "",
+      "default": {},
+      "examples": [
+        {
+          "tlsEnabled": false,
+          "annotations": {
+            "kubernetes.io/ingress.class": "nginx"
+          },
+          "host": "my-release.mycompany.com"
+        }
+      ],
+      "required": [],
+      "properties": {
+        "host": {
+          "$id": "#/properties/ingress/properties/host",
+          "type": "string",
+          "title": "Host Name",
+          "description": "Where your application will be accessible",
+          "default": "",
+          "examples": [
+            "my-release.mycompany.com"
+          ]
+        },
+        "path": {
+          "$id": "#/properties/ingress/properties/ingressPath",
+          "type": "string",
+          "title": "Path",
+          "description": "The API path where your service is accessible",
+          "default": "/",
+          "examples": [
+            "/api/myservice"
+          ]
+        },
+        "tlsEnabled": {
+          "$id": "#/properties/ingress/properties/tlsEnabled",
+          "type": "boolean",
+          "title": "HTTPS",
+          "description": "",
+          "default": false,
+          "examples": [
+            false
+          ]
+        },
+        "annotations": {
+          "$id": "#/properties/ingress/properties/annotations",
+          "type": "object",
+          "title": "Annotations",
+          "description": "Annotations are used to control ingress behavior. See the full list for the Ingress Nginx project at https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/. Use the `cert-manager.io/cluster-issuer:\"letsencrypt\"` one to request TLS certificates, `kubernetes.io/ingress.class: \"nginx\"` to select an ingress controller.",
+          "default": {},
+          "examples": [
+            {
+              "kubernetes.io/ingress.class": "nginx"
+            }
+          ],
+          "additionalProperties": true
+        }
+      }
+    }
+  },
+  "additionalProperties": true
+}

charts/static-site/values.yaml

@@ -0,0 +1,60 @@
+# Default values for static-site.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  tag: latest
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: 
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  runAsUser: 0
+
+service:
+  type: ClusterIP
+  port: 80
+
+# ingress:
+#   host: dummyapp.127.0.0.1.nip.io
+#   ingressClassName: nginx
+#   tlsEnabled: false
+#   annotations:
+#     cert-manager.io/cluster-issuer: letsencrypt-staging
+
+
+resources: 
+  requests:
+    cpu: 200m
+    memory: 200Mi
+  limits:
+    cpu: 200m
+    memory: 200Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# values to build and deploy static sites
+gitCloneUrl: https://github.com/gimlet-io/reactjs-test-app.git
+buildImage: "node:latest"
+buildScript: |
+  npm install && npm run build
+builtAssets: build/