helm(minor): don't directly mount configmap
This commit is contained in:
parent
7f1455cb12
commit
93e0441b58
|
@ -3,6 +3,7 @@ http = 0.0.0.0:8000
|
||||||
chdir = /app
|
chdir = /app
|
||||||
wsgi-file = passbook/root/wsgi.py
|
wsgi-file = passbook/root/wsgi.py
|
||||||
processes = 4
|
processes = 4
|
||||||
|
master = true
|
||||||
threads = 2
|
threads = 2
|
||||||
enable-threads = true
|
enable-threads = true
|
||||||
uid = passbook
|
uid = passbook
|
||||||
|
|
|
@ -20,10 +20,6 @@ spec:
|
||||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
passbook.io/component: web
|
passbook.io/component: web
|
||||||
spec:
|
spec:
|
||||||
volumes:
|
|
||||||
- name: config-volume
|
|
||||||
configMap:
|
|
||||||
name: {{ include "passbook.fullname" . }}-config
|
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: passbook-database-migrations
|
- name: passbook-database-migrations
|
||||||
image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}"
|
image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}"
|
||||||
|
@ -46,9 +42,6 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: "{{ .Release.Name }}-postgresql"
|
name: "{{ .Release.Name }}-postgresql"
|
||||||
key: postgresql-password
|
key: postgresql-password
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /etc/passbook
|
|
||||||
name: config-volume
|
|
||||||
containers:
|
containers:
|
||||||
- name: {{ .Chart.Name }}
|
- name: {{ .Chart.Name }}
|
||||||
image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}"
|
image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}"
|
||||||
|
@ -76,9 +69,6 @@ spec:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: 8000
|
containerPort: 8000
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /etc/passbook
|
|
||||||
name: config-volume
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
|
|
|
@ -20,10 +20,6 @@ spec:
|
||||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
passbook.io/component: worker
|
passbook.io/component: worker
|
||||||
spec:
|
spec:
|
||||||
volumes:
|
|
||||||
- name: config-volume
|
|
||||||
configMap:
|
|
||||||
name: {{ include "passbook.fullname" . }}-config
|
|
||||||
containers:
|
containers:
|
||||||
- name: {{ .Chart.Name }}
|
- name: {{ .Chart.Name }}
|
||||||
image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}"
|
image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}"
|
||||||
|
@ -51,13 +47,6 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: "{{ .Release.Name }}-postgresql"
|
name: "{{ .Release.Name }}-postgresql"
|
||||||
key: postgresql-password
|
key: postgresql-password
|
||||||
ports:
|
|
||||||
- name: http
|
|
||||||
containerPort: 8000
|
|
||||||
protocol: TCP
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /etc/passbook
|
|
||||||
name: config-volume
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 150m
|
cpu: 150m
|
||||||
|
|
|
@ -253,7 +253,6 @@ with CONFIG.cd('log'):
|
||||||
'grpc': 'DEBUG',
|
'grpc': 'DEBUG',
|
||||||
'oauthlib': 'DEBUG',
|
'oauthlib': 'DEBUG',
|
||||||
'oauth2_provider': 'DEBUG',
|
'oauth2_provider': 'DEBUG',
|
||||||
'daphne': 'INFO',
|
|
||||||
}
|
}
|
||||||
LOGGING = {
|
LOGGING = {
|
||||||
'version': 1,
|
'version': 1,
|
||||||
|
|
Reference in New Issue