closer
This commit is contained in:
		
							parent
							
								
									bd25ca649c
								
							
						
					
					
						commit
						e935541b40
					
				
					 4 changed files with 56 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -61,3 +61,52 @@ Create the name of the service account to use
 | 
			
		|||
    {{ default "default" .Values.serviceAccount.name }}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- 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).
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "glitchtip.postgresql.fullname" -}}
 | 
			
		||||
{{- if .Values.postgresql.fullnameOverride -}}
 | 
			
		||||
{{- .Values.postgresql.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 | 
			
		||||
{{- else -}}
 | 
			
		||||
{{- $name := default .Chart.Name .Values.postgresql.nameOverride -}}
 | 
			
		||||
{{- if contains $name .Release.Name -}}
 | 
			
		||||
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 | 
			
		||||
{{- else -}}
 | 
			
		||||
{{- printf "%s-%s" .Release.Name "glitchtip-postgresql" | trunc 63 | trimSuffix "-" -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- define "glitchtip.redis.fullname" -}}
 | 
			
		||||
{{- if .Values.redis.fullnameOverride -}}
 | 
			
		||||
{{- .Values.redis.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 | 
			
		||||
{{- else -}}
 | 
			
		||||
{{- $name := default .Chart.Name .Values.redis.nameOverride -}}
 | 
			
		||||
{{- if contains $name .Release.Name -}}
 | 
			
		||||
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 | 
			
		||||
{{- else -}}
 | 
			
		||||
{{- printf "%s-%s" .Release.Name "glitchtip-redis" | trunc 63 | trimSuffix "-" -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Set redis host
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "glitchtip.redis.host" -}}
 | 
			
		||||
{{- if .Values.redis.enabled -}}
 | 
			
		||||
{{- template "glitchtip.redis.fullname" . -}}-master
 | 
			
		||||
{{- else -}}
 | 
			
		||||
{{- .Values.redis.host | quote -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 | 
			
		||||
{{/*
 | 
			
		||||
Set redis url
 | 
			
		||||
*/}}
 | 
			
		||||
{{- define "glitchtip.redis.url" -}}
 | 
			
		||||
{{- if .Values.redis.enabled -}}
 | 
			
		||||
redis://{{- template "glitchtip.redis.password" -}}{{- template "glitchtip.redis.fullname" . -}}-master
 | 
			
		||||
{{- end -}}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
| 
						 | 
				
			
			@ -8,4 +8,4 @@ type: Opaque
 | 
			
		|||
data:
 | 
			
		||||
  DATABASE_URL: {{ required "databaseURL is a required value." .Values.databaseURL | b64enc | quote }}
 | 
			
		||||
  SECRET_KEY: {{ required "secretKey is a required value." .Values.secretKey | b64enc | quote }}
 | 
			
		||||
  REDIS_URL: "redis"
 | 
			
		||||
  REDIS_URL: {{ printf "redis://:@glitchtip-staging-glitchtip-redis-master:6379/0" | b64enc | quote }}
 | 
			
		||||
| 
						 | 
				
			
			@ -9,10 +9,12 @@ spec:
 | 
			
		|||
  selector:
 | 
			
		||||
    matchLabels:
 | 
			
		||||
      {{- include "glitchtip.selectorLabels" . | nindent 6 }}
 | 
			
		||||
      role: web
 | 
			
		||||
  template:
 | 
			
		||||
    metadata:
 | 
			
		||||
      labels:
 | 
			
		||||
        {{- include "glitchtip.selectorLabels" . | nindent 8 }}
 | 
			
		||||
        role: web
 | 
			
		||||
      annotations:
 | 
			
		||||
        checksum/secrets.yaml: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
 | 
			
		||||
    spec:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue