Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(helm): resolve agent reviews and suggestions

justin9380e6985392
diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
index 8a96447fb..4c6e56356 100644
--- a/.github/workflows/helm-chart.yml
+++ b/.github/workflows/helm-chart.yml
@@ -56,6 +56,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+ with:
+ persist-credentials: false
- name: Set up Helm
uses: azure/setup-helm@bf6a7d304bc2fdb57e0331155b7ebf2c504acf0a # v4
@@ -77,6 +79,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+ with:
+ persist-credentials: false
- name: Set up Helm
uses: azure/setup-helm@bf6a7d304bc2fdb57e0331155b7ebf2c504acf0a # v4
@@ -87,7 +91,10 @@ jobs:
helm package "$CHART_PATH" --destination dist
- name: Log in to GHCR
- run: echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login "$REGISTRY" --username "${{ github.actor }}" --password-stdin
+ env:
+ GH_ACTOR: ${{ github.actor }}
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: echo "$GH_TOKEN" | helm registry login "$REGISTRY" --username "$GH_ACTOR" --password-stdin
- name: Publish chart
run: |
diff --git a/charts/kaneo/templates/_helpers.tpl b/charts/kaneo/templates/_helpers.tpl
index 90fed4b76..e8c48f169 100644
--- a/charts/kaneo/templates/_helpers.tpl
+++ b/charts/kaneo/templates/_helpers.tpl
@@ -61,6 +61,14 @@ Create the name of the service account to use
{{- end }}
{{- end }}
+{{/*
+URL-encode credentials for URI userinfo. Sprig urlquery uses form escaping,
+so spaces become +; in userinfo they must be %20 to preserve credentials.
+*/}}
+{{- define "kaneo.urlencodeUserinfo" -}}
+{{- . | urlquery | replace "+" "%20" -}}
+{{- end }}
+
{{/*
API component common labels
*/}}
diff --git a/charts/kaneo/templates/deployment.yaml b/charts/kaneo/templates/deployment.yaml
index f0600b0c2..9542b47e4 100644
--- a/charts/kaneo/templates/deployment.yaml
+++ b/charts/kaneo/templates/deployment.yaml
@@ -65,13 +65,13 @@ spec:
name: {{ .Values.kaneo.env.database.external.existingSecret.name }}
key: {{ .Values.kaneo.env.database.external.existingSecret.passwordKey }}
{{- else }}
- value: "postgresql://{{ .Values.kaneo.env.database.external.username | urlquery }}:{{ .Values.kaneo.env.database.external.password | urlquery }}@{{ .Values.kaneo.env.database.external.host }}:{{ .Values.kaneo.env.database.external.port }}/{{ .Values.kaneo.env.database.external.database }}"
+ value: "postgresql://{{ include "kaneo.urlencodeUserinfo" .Values.kaneo.env.database.external.username }}:{{ include "kaneo.urlencodeUserinfo" .Values.kaneo.env.database.external.password }}@{{ .Values.kaneo.env.database.external.host }}:{{ .Values.kaneo.env.database.external.port }}/{{ .Values.kaneo.env.database.external.database }}"
{{- end }}
{{- else }}
{{- if .Values.postgresql.auth.existingSecret }}
- value: "postgresql://{{ .Values.postgresql.auth.username | urlquery }}:$(KANEO_POSTGRES_PASSWORD)@{{ include "kaneo.fullname" . }}-postgresql:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.auth.database }}"
+ value: "postgresql://{{ include "kaneo.urlencodeUserinfo" .Values.postgresql.auth.username }}:$(KANEO_POSTGRES_PASSWORD)@{{ include "kaneo.fullname" . }}-postgresql:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.auth.database }}"
{{- else }}
- value: "postgresql://{{ .Values.postgresql.auth.username | urlquery }}:{{ .Values.postgresql.auth.password | urlquery }}@{{ include "kaneo.fullname" . }}-postgresql:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.auth.database }}"
+ value: "postgresql://{{ include "kaneo.urlencodeUserinfo" .Values.postgresql.auth.username }}:{{ include "kaneo.urlencodeUserinfo" .Values.postgresql.auth.password }}@{{ include "kaneo.fullname" . }}-postgresql:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.auth.database }}"
{{- end }}
{{- end }}
{{- if and (not .Values.kaneo.env.database.external.enabled) .Values.postgresql.auth.existingSecret }}
diff --git a/charts/kaneo/templates/validations.yaml b/charts/kaneo/templates/validations.yaml
index 7a72d4758..581ae2b27 100644
--- a/charts/kaneo/templates/validations.yaml
+++ b/charts/kaneo/templates/validations.yaml
@@ -2,6 +2,9 @@
{{- if and $publicExposureEnabled (not .Values.kaneo.env.existingSecret.enabled) (eq .Values.kaneo.env.authSecret "change_me_to_at_least_32_characters_long_string") -}}
{{- fail "kaneo.env.authSecret must be changed or provided via kaneo.env.existingSecret before enabling ingress or gateway" -}}
{{- end -}}
+{{- if and $publicExposureEnabled (not .Values.kaneo.env.existingSecret.enabled) (lt (len (.Values.kaneo.env.authSecret | toString)) 32) -}}
+{{- fail "kaneo.env.authSecret must be at least 32 characters or provided via kaneo.env.existingSecret before enabling ingress or gateway" -}}
+{{- end -}}
{{- if and $publicExposureEnabled .Values.postgresql.enabled (not .Values.postgresql.auth.existingSecret) (eq .Values.postgresql.auth.password "kaneo_password") -}}
{{- fail "postgresql.auth.password must be changed or provided via postgresql.auth.existingSecret before enabling ingress or gateway" -}}
{{- end -}}