From 7bf3ab47f4e77bed88c3682a7e31429fdb42a9d2 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Sun, 27 Oct 2024 11:55:30 +0100 Subject: [PATCH] fix: errors --- Makefile | 4 ++-- charts/namespace/Chart.yaml | 4 ++-- charts/namespace/README.md | 2 +- charts/namespace/templates/persistentvolumeclaim.yaml | 2 +- charts/squadron-keel-server/Chart.yaml | 4 ++-- charts/squadron-keel-server/README.md | 3 ++- .../templates/persistentvolumeclaim.yaml | 1 + charts/squadron-keel-server/values.schema.json | 7 +++++++ charts/squadron-keel-server/values.yaml | 6 ++++++ charts/squadron-nextjs-server/Chart.yaml | 4 ++-- charts/squadron-nextjs-server/README.md | 3 ++- charts/squadron-nextjs-server/values.schema.json | 7 +++++++ charts/squadron-nextjs-server/values.yaml | 6 ++++++ 13 files changed, 41 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8273f5b..f276dc9 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,9 @@ check: lint schema docs .PHONY: lint ## Lint Helm charts ## https://github.com/helm/chart-testing -lint: +lint: schema @for dir in ./charts/* ; do \ - helm lint $${dir} ;\ + helm lint $${dir} --strict ;\ done .PHONY: docs diff --git a/charts/namespace/Chart.yaml b/charts/namespace/Chart.yaml index 2f15240..fe42a43 100644 --- a/charts/namespace/Chart.yaml +++ b/charts/namespace/Chart.yaml @@ -14,5 +14,5 @@ annotations: - name: Chart Source url: https://github.com/foomo/helm-charts -version: 0.2.0 -appVersion: 0.2.0 +version: 0.2.1 +appVersion: 0.2.1 diff --git a/charts/namespace/README.md b/charts/namespace/README.md index 93fb955..53877b7 100644 --- a/charts/namespace/README.md +++ b/charts/namespace/README.md @@ -1,6 +1,6 @@ # namespace -![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square) +![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.1](https://img.shields.io/badge/AppVersion-0.2.1-informational?style=flat-square) Common Namespace Resource Chart diff --git a/charts/namespace/templates/persistentvolumeclaim.yaml b/charts/namespace/templates/persistentvolumeclaim.yaml index 8456ca7..cd0c905 100644 --- a/charts/namespace/templates/persistentvolumeclaim.yaml +++ b/charts/namespace/templates/persistentvolumeclaim.yaml @@ -6,7 +6,7 @@ metadata: labels: {{- include "namespace.labels" $ | nindent 4 }} {{- with $value.annotations }} annotations: {{ toYaml . | nindent 4 }} - {{-end }} + {{- end }} namespace: {{ include "namespace.namespace" $ }} spec: {{- if $value.name }} diff --git a/charts/squadron-keel-server/Chart.yaml b/charts/squadron-keel-server/Chart.yaml index 3cb4f96..77e0d64 100644 --- a/charts/squadron-keel-server/Chart.yaml +++ b/charts/squadron-keel-server/Chart.yaml @@ -15,5 +15,5 @@ annotations: - name: Chart Source url: https://github.com/foomo/helm-charts -version: 0.1.6 -appVersion: 0.1.6 +version: 0.1.7 +appVersion: 0.1.7 diff --git a/charts/squadron-keel-server/README.md b/charts/squadron-keel-server/README.md index ac253d1..36c716e 100644 --- a/charts/squadron-keel-server/README.md +++ b/charts/squadron-keel-server/README.md @@ -1,6 +1,6 @@ # squadron-keel-server -![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.6](https://img.shields.io/badge/AppVersion-0.1.6-informational?style=flat-square) +![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.7](https://img.shields.io/badge/AppVersion-0.1.7-informational?style=flat-square) Squadron Keel Server Chart @@ -69,6 +69,7 @@ Squadron Keel Server Chart |-----|------|---------|-------------| | image.pullPolicy | string | `"IfNotPresent"` | Image tag | | image.pullSecrets | list | `[]` | Image pull secrets | +| image.recreate | bool | `false` | Force recreation | | image.repository | string | `""` | Image repository | | image.tag | string | `""` | Image tag | diff --git a/charts/squadron-keel-server/templates/persistentvolumeclaim.yaml b/charts/squadron-keel-server/templates/persistentvolumeclaim.yaml index 92c6538..629c74c 100644 --- a/charts/squadron-keel-server/templates/persistentvolumeclaim.yaml +++ b/charts/squadron-keel-server/templates/persistentvolumeclaim.yaml @@ -14,3 +14,4 @@ spec: requests: storage: {{ .Values.persistence.size }} --- +{{- end }} diff --git a/charts/squadron-keel-server/values.schema.json b/charts/squadron-keel-server/values.schema.json index 53d890b..2f1b291 100644 --- a/charts/squadron-keel-server/values.schema.json +++ b/charts/squadron-keel-server/values.schema.json @@ -167,6 +167,13 @@ "title": "pullSecrets", "type": "array" }, + "recreate": { + "default": false, + "description": "Force recreation", + "required": [], + "title": "recreate", + "type": "boolean" + }, "repository": { "default": "", "description": "Image repository", diff --git a/charts/squadron-keel-server/values.yaml b/charts/squadron-keel-server/values.yaml index 24c5a9f..26b1e16 100644 --- a/charts/squadron-keel-server/values.yaml +++ b/charts/squadron-keel-server/values.yaml @@ -221,6 +221,12 @@ otel: # @schema # Image settings image: + # @schema + # type: boolean + # @schema + # -- Force recreation + # @section -- Image settings + recreate: false # @schema # enum: [IfNotPresent, Always] # @schema diff --git a/charts/squadron-nextjs-server/Chart.yaml b/charts/squadron-nextjs-server/Chart.yaml index c349fed..80a884d 100644 --- a/charts/squadron-nextjs-server/Chart.yaml +++ b/charts/squadron-nextjs-server/Chart.yaml @@ -14,5 +14,5 @@ annotations: - name: Chart Source url: https://github.com/foomo/helm-charts -version: 0.1.1 -appVersion: 0.1.1 +version: 0.1.2 +appVersion: 0.1.2 diff --git a/charts/squadron-nextjs-server/README.md b/charts/squadron-nextjs-server/README.md index 9eeb487..b8dd8a1 100644 --- a/charts/squadron-nextjs-server/README.md +++ b/charts/squadron-nextjs-server/README.md @@ -1,6 +1,6 @@ # squadron-nextjs-server -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.1](https://img.shields.io/badge/AppVersion-0.1.1-informational?style=flat-square) +![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square) Squadron NextJS Server Chart @@ -76,6 +76,7 @@ Squadron NextJS Server Chart |-----|------|---------|-------------| | image.pullPolicy | string | `"IfNotPresent"` | Image tag | | image.pullSecrets | list | `[]` | Image pull secrets | +| image.recreate | bool | `false` | Force recreation | | image.repository | string | `""` | Image repository | | image.tag | string | `""` | Image tag | diff --git a/charts/squadron-nextjs-server/values.schema.json b/charts/squadron-nextjs-server/values.schema.json index ab561ff..8589153 100644 --- a/charts/squadron-nextjs-server/values.schema.json +++ b/charts/squadron-nextjs-server/values.schema.json @@ -207,6 +207,13 @@ "title": "pullSecrets", "type": "array" }, + "recreate": { + "default": false, + "description": "Force recreation", + "required": [], + "title": "recreate", + "type": "boolean" + }, "repository": { "default": "", "description": "Image repository", diff --git a/charts/squadron-nextjs-server/values.yaml b/charts/squadron-nextjs-server/values.yaml index 3a2eb34..a45046c 100644 --- a/charts/squadron-nextjs-server/values.yaml +++ b/charts/squadron-nextjs-server/values.yaml @@ -197,6 +197,12 @@ otel: # @schema # Image settings image: + # @schema + # type: boolean + # @schema + # -- Force recreation + # @section -- Image settings + recreate: false # @schema # enum: [IfNotPresent, Always] # @schema