Skip to content

Commit

Permalink
Merge pull request #31 from foomo/squadron-charts-fix
Browse files Browse the repository at this point in the history
fix: errors
  • Loading branch information
franklinkim authored Oct 27, 2024
2 parents b2f39f4 + 7bf3ab4 commit 1ff6c4e
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/namespace/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion charts/namespace/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion charts/namespace/templates/persistentvolumeclaim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/squadron-keel-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion charts/squadron-keel-server/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 |

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ spec:
requests:
storage: {{ .Values.persistence.size }}
---
{{- end }}
7 changes: 7 additions & 0 deletions charts/squadron-keel-server/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@
"title": "pullSecrets",
"type": "array"
},
"recreate": {
"default": false,
"description": "Force recreation",
"required": [],
"title": "recreate",
"type": "boolean"
},
"repository": {
"default": "",
"description": "Image repository",
Expand Down
6 changes: 6 additions & 0 deletions charts/squadron-keel-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/squadron-nextjs-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion charts/squadron-nextjs-server/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 |

Expand Down
7 changes: 7 additions & 0 deletions charts/squadron-nextjs-server/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,13 @@
"title": "pullSecrets",
"type": "array"
},
"recreate": {
"default": false,
"description": "Force recreation",
"required": [],
"title": "recreate",
"type": "boolean"
},
"repository": {
"default": "",
"description": "Image repository",
Expand Down
6 changes: 6 additions & 0 deletions charts/squadron-nextjs-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1ff6c4e

Please sign in to comment.