Use more generic name "django" instead of glitchtip for template

variables
This commit is contained in:
David Burke 2021-02-12 17:39:59 -05:00
parent e957cae6de
commit 883d0c6d20
15 changed files with 76 additions and 76 deletions

View file

@ -1,9 +1,9 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "glitchtip.fullname" . }}-web
name: {{ include "django.fullname" . }}-web
labels:
{{- include "glitchtip.labels" . | nindent 4 }}
{{- include "django.labels" . | nindent 4 }}
app.kubernetes.io/component: web
spec:
{{- if not .Values.web.autoscaling.enabled }}
@ -11,7 +11,7 @@ spec:
{{- end }}
selector:
matchLabels:
{{- include "glitchtip.selectorLabels" . | nindent 6 }}
{{- include "django.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: web
template:
metadata:
@ -20,14 +20,14 @@ spec:
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
tag: "{{ .Values.image.tag }}"
labels:
{{- include "glitchtip.selectorLabels" . | nindent 8 }}
{{- include "django.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: web
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "glitchtip.serviceAccountName" . }}
serviceAccountName: {{ include "django.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
@ -66,11 +66,11 @@ spec:
valueFrom:
secretKeyRef:
key: redis-password
name: {{ include "glitchtip.fullname" . }}-redis
name: {{ include "django.fullname" . }}-redis
- name: REDIS_HOST
value: {{ template "glitchtip.redis.host" . }}
value: {{ template "django.redis.host" . }}
- name: REDIS_PORT
value: {{ template "glitchtip.redis.port" . }}
value: {{ template "django.redis.port" . }}
{{- end }}
- name: POD_IP
valueFrom:
@ -78,9 +78,9 @@ spec:
fieldPath: status.podIP
envFrom:
- secretRef:
name: {{ include "glitchtip.fullname" . }}
name: {{ include "django.fullname" . }}
- configMapRef:
name: {{ include "glitchtip.fullname" . }}
name: {{ include "django.fullname" . }}
{{- with .Values.web.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}

View file

@ -2,14 +2,14 @@
apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
metadata:
name: {{ template "glitchtip.fullname" . }}
name: {{ template "django.fullname" . }}
labels:
{{- include "glitchtip.labels" . | nindent 4 }}
{{- include "django.labels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ template "glitchtip.fullname" . }}-web
name: {{ template "django.fullname" . }}-web
minReplicas: {{ .Values.web.autoscaling.minReplicas }}
maxReplicas: {{ .Values.web.autoscaling.maxReplicas }}
metrics:

View file

@ -1,5 +1,5 @@
{{- if .Values.web.ingress.enabled -}}
{{- $fullName := include "glitchtip.fullname" . -}}
{{- $fullName := include "django.fullname" . -}}
{{- $svcPort := .Values.web.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
@ -10,7 +10,7 @@ kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "glitchtip.labels" . | nindent 4 }}
{{- include "django.labels" . | nindent 4 }}
{{- with .Values.web.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}

View file

@ -3,14 +3,14 @@
apiVersion: policy/v1beta1
kind: PodDisruptionBudget
metadata:
name: {{ include "glitchtip.fullname" . }}-web
name: {{ include "django.fullname" . }}-web
labels:
{{- include "glitchtip.labels" . | nindent 4 }}
{{- include "django.labels" . | nindent 4 }}
spec:
minAvailable: {{ .Values.web.budget.minAvailable }}
selector:
matchLabels:
{{- include "glitchtip.selectorLabels" . | nindent 6 }}
{{- include "django.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: web
{{- end -}}
{{- end -}}

View file

@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "glitchtip.fullname" . }}-web
name: {{ include "django.fullname" . }}-web
labels:
{{- include "glitchtip.labels" . | nindent 4 }}
{{- include "django.labels" . | nindent 4 }}
spec:
type: {{ .Values.web.service.type }}
ports:
@ -12,5 +12,5 @@ spec:
protocol: TCP
name: http
selector:
{{- include "glitchtip.selectorLabels" . | nindent 4 }}
{{- include "django.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: web