Browse Source

Remove initContainer

pull/2071/head
rong.zhang 7 years ago
parent
commit
df21fc8643
2 changed files with 5 additions and 13 deletions
  1. 8
      roles/kubernetes-apps/ansible/defaults/main.yml
  2. 10
      roles/kubernetes-apps/ansible/templates/dashboard.yml.j2

8
roles/kubernetes-apps/ansible/defaults/main.yml

@ -51,10 +51,6 @@ dashboard_memory_limit: 256M
dashboard_cpu_requests: 50m
dashboard_memory_requests: 64M
# SSL
etcd_cert_dir: "/etc/ssl/etcd/ssl"
canal_cert_dir: "/etc/canal/certs"
# Set dashboard_use_custom_certs to true if overriding dashboard_certs_secret_name with a secret that
# contains dashboard_tls_key_file and dashboard_tls_cert_file instead of using the initContainer provisioned certs
dashboard_use_custom_certs: false
@ -62,6 +58,10 @@ dashboard_certs_secret_name: kubernetes-dashboard-certs
dashboard_tls_key_file: dashboard.key
dashboard_tls_cert_file: dashboard.crt
# SSL
etcd_cert_dir: "/etc/ssl/etcd/ssl"
canal_cert_dir: "/etc/canal/certs"
rbac_resources:
- sa
- clusterrole

10
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2

@ -140,14 +140,6 @@ spec:
labels:
k8s-app: kubernetes-dashboard
spec:
{% if dashboard_use_custom_certs %}
initContainers:
- name: kubernetes-dashboard-init
image: {{ dashboard_init_image_repo }}:{{ dashboard_init_image_tag }}
volumeMounts:
- name: kubernetes-dashboard-certs
mountPath: /certs
{% endif %}
containers:
- name: kubernetes-dashboard
image: {{ dashboard_image_repo }}:{{ dashboard_image_tag }}
@ -166,10 +158,10 @@ spec:
{% if dashboard_use_custom_certs %}
- --tls-key-file={{ dashboard_tls_key_file }}
- --tls-cert-file={{ dashboard_tls_cert_file }}
- --authentication-mode=token{% if kube_basic_auth|default(false) %},basic{% endif %}
{% else %}
- --auto-generate-certificates
{% endif %}
- --authentication-mode=token{% if kube_basic_auth|default(false) %},basic{% endif %}
# Uncomment the following line to manually specify Kubernetes API server Host
# If not specified, Dashboard will attempt to auto discover the API server and connect
# to it. Uncomment only if the default does not work.

Loading…
Cancel
Save