Skip to content

Commit

Permalink
update charts
Browse files Browse the repository at this point in the history
  • Loading branch information
jlandowner committed Jul 28, 2023
1 parent a6c94f3 commit c5b457d
Showing 25 changed files with 29 additions and 7 deletions.
4 changes: 2 additions & 2 deletions charts/cosmo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@ apiVersion: v2
name: cosmo
description: COSMO Helm chart for Kubernetes
type: application
version: 1.0.0-rc1
appVersion: v1.0.0-rc1
version: 1.0.0-rc2
appVersion: v1.0.0-rc2
kubeVersion: ">= 1.19.0-0"
home: https://github.com/cosmo-workspace/cosmo
icon: https://raw.githubusercontent.com/cosmo-workspace/cosmo/main/logo/logo-square-small.png
2 changes: 1 addition & 1 deletion charts/cosmo/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -62,5 +62,5 @@ Required domain
Dashboad URL
*/}}
{{- define "cosmo.dashboard.signinUrl" -}}
{{ if .Values.dashboard.tls.insecure -}}http{{- else -}}https{{ end }}://{{ .Values.dashboard.ingressRoute.host }}.{{ .Values.domain }}/#/signin
{{ if not .Values.dashboard.tls.enabled -}}http{{- else -}}https{{ end }}://{{ .Values.dashboard.ingressRoute.host }}.{{ .Values.domain }}/#/signin
{{- end }}
1 change: 1 addition & 0 deletions charts/cosmo/templates/auth-env-secret.yaml
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ kind: Secret
metadata:
name: cosmo-auth-env
namespace: "{{ .Release.Namespace }}"
immutable: {{ .Values.dashboard.session.secretKeys.immutable }}
data:
COOKIE_DOMAIN: "{{ include "cosmo.domain" . | b64enc }}"
SIGNIN_URL: {{ include "cosmo.dashboard.signinUrl" . | b64enc | quote }}
6 changes: 3 additions & 3 deletions charts/cosmo/templates/dashboard/ingressroute.yaml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ spec:
name: cosmo-dashboard
namespace: {{ .Release.Namespace }}
port: cosmo-dashboard-ui-server
scheme: {{ if .Values.dashboard.tls.insecure -}}http{{- else -}}https{{ end }}
scheme: {{ if not .Values.dashboard.tls.enabled -}}http{{- else -}}https{{ end }}
{{- end }}
- kind: Rule
match: Host(`{{ .Values.dashboard.ingressRoute.host }}.{{ .Values.domain }}`) && (Path(`/`) || PathPrefix(`/logo`,`/assets/`,`/dashboard.v1alpha1.AuthService/`))
@@ -36,7 +36,7 @@ spec:
name: cosmo-dashboard
namespace: {{ .Release.Namespace }}
port: cosmo-dashboard-server
scheme: {{ if .Values.dashboard.tls.insecure -}}http{{- else -}}https{{ end }}
scheme: {{ if not .Values.dashboard.tls.enabled -}}http{{- else -}}https{{ end }}
- kind: Rule
match: Host(`{{ .Values.dashboard.ingressRoute.host }}.{{ .Values.domain }}`)
priority: 1000
@@ -45,7 +45,7 @@ spec:
name: cosmo-dashboard
namespace: {{ .Release.Namespace }}
port: cosmo-dashboard-server
scheme: {{ if .Values.dashboard.tls.insecure -}}http{{- else -}}https{{ end }}
scheme: {{ if not .Values.dashboard.tls.enabled -}}http{{- else -}}https{{ end }}
{{- with .Values.dashboard.ingressRoute.middlewares }}
middlewares:
{{- toYaml . | nindent 8 }}
Original file line number Diff line number Diff line change
@@ -1056,6 +1056,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1056,6 +1056,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1053,6 +1053,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1048,6 +1048,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -861,6 +861,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1072,6 +1072,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1024,7 +1024,8 @@ SnapShot = """
COOKIE_DOMAIN: ZXhhbXBsZS5jb20=
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
SIGNIN_URL: aHR0cDovL2Rhc2hib2FyZC5leGFtcGxlLmNvbS8jL3NpZ25pbg==
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1078,6 +1078,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1078,6 +1078,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1070,6 +1070,7 @@ SnapShot = """
COOKIE_HASHKEY: hash_key
COOKIE_SESSION_NAME: sess_name
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: false
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1070,6 +1070,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
1 change: 1 addition & 0 deletions charts/cosmo/test/__snapshots__/test-default.snap
Original file line number Diff line number Diff line change
@@ -1070,6 +1070,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
1 change: 1 addition & 0 deletions charts/cosmo/test/__snapshots__/test-fullnameOverride.snap
Original file line number Diff line number Diff line change
@@ -1070,6 +1070,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
1 change: 1 addition & 0 deletions charts/cosmo/test/__snapshots__/test-localRunTest.snap
Original file line number Diff line number Diff line change
@@ -1119,6 +1119,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
1 change: 1 addition & 0 deletions charts/cosmo/test/__snapshots__/test-logging.snap
Original file line number Diff line number Diff line change
@@ -1072,6 +1072,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
1 change: 1 addition & 0 deletions charts/cosmo/test/__snapshots__/test-nameOverride.snap
Original file line number Diff line number Diff line change
@@ -1070,6 +1070,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1076,6 +1076,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
1 change: 1 addition & 0 deletions charts/cosmo/test/__snapshots__/test-traefik-diabled.snap
Original file line number Diff line number Diff line change
@@ -825,6 +825,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
Original file line number Diff line number Diff line change
@@ -1070,6 +1070,7 @@ SnapShot = """
COOKIE_HASHKEY: '###DYNAMIC_FIELD###'
COOKIE_SESSION_NAME: '###DYNAMIC_FIELD###'
SIGNIN_URL: aHR0cHM6Ly9kYXNoYm9hcmQuZXhhbXBsZS5jb20vIy9zaWduaW4=
immutable: true
kind: Secret
metadata:
name: cosmo-auth-env
1 change: 1 addition & 0 deletions charts/cosmo/test/test-dashboard-fixed-session-key.yaml
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ domain: example.com
dashboard:
session:
secretKeys:
immutable: false
COOKIE_HASHKEY: hash_key
COOKIE_BLOCKKEY: block_key
COOKIE_SESSION_NAME: sess_name
1 change: 1 addition & 0 deletions charts/cosmo/values.yaml
Original file line number Diff line number Diff line change
@@ -192,6 +192,7 @@ dashboard:
# but when you are using ArgoCD, these secret keys are changed every sync
# because it uses 'helm template' command and lookup function does not work.
secretKeys:
immutable: true
COOKIE_HASHKEY:
COOKIE_BLOCKKEY:
COOKIE_SESSION_NAME:

0 comments on commit c5b457d

Please sign in to comment.