Add ability to use custom cert secret instead of init container provisioned self-signed certs
This commit is contained in:
parent
0c6f172e75
commit
a89ee8c406
|
@ -54,6 +54,12 @@ dashboard_memory_requests: 64M
|
||||||
# SSL
|
# SSL
|
||||||
etcd_cert_dir: "/etc/ssl/etcd/ssl"
|
etcd_cert_dir: "/etc/ssl/etcd/ssl"
|
||||||
canal_cert_dir: "/etc/canal/certs"
|
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
|
||||||
|
dashboard_certs_secret_name: kubernetes-dashboard-certs
|
||||||
|
dashboard_tls_key_file: dashboard.key
|
||||||
|
dashboard_tls_cert_file: dashboard.crt
|
||||||
|
|
||||||
rbac_resources:
|
rbac_resources:
|
||||||
- sa
|
- sa
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
kubectl: "{{bin_dir}}/kubectl"
|
kubectl: "{{bin_dir}}/kubectl"
|
||||||
resource: "{{ item }}"
|
resource: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: ['ClusterRoleBinding']
|
with_items:
|
||||||
|
- 'ClusterRoleBinding'
|
||||||
tags:
|
tags:
|
||||||
- upgrade
|
- upgrade
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,9 @@
|
||||||
kubectl: "{{bin_dir}}/kubectl"
|
kubectl: "{{bin_dir}}/kubectl"
|
||||||
resource: "{{ item }}"
|
resource: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: ['deploy', 'svc']
|
with_items:
|
||||||
|
- 'deploy'
|
||||||
|
- 'svc'
|
||||||
tags:
|
tags:
|
||||||
- upgrade
|
- upgrade
|
||||||
|
|
||||||
|
|
|
@ -127,12 +127,14 @@ spec:
|
||||||
labels:
|
labels:
|
||||||
k8s-app: kubernetes-dashboard
|
k8s-app: kubernetes-dashboard
|
||||||
spec:
|
spec:
|
||||||
|
{% if not dashboard_use_custom_certs %}
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: kubernetes-dashboard-init
|
- name: kubernetes-dashboard-init
|
||||||
image: {{ dashboard_init_image_repo }}:{{ dashboard_init_image_tag }}
|
image: {{ dashboard_init_image_repo }}:{{ dashboard_init_image_tag }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: kubernetes-dashboard-certs
|
- name: kubernetes-dashboard-certs
|
||||||
mountPath: /certs
|
mountPath: /certs
|
||||||
|
{% endif %}
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-dashboard
|
- name: kubernetes-dashboard
|
||||||
image: {{ dashboard_image_repo }}:{{ dashboard_image_tag }}
|
image: {{ dashboard_image_repo }}:{{ dashboard_image_tag }}
|
||||||
|
@ -148,8 +150,8 @@ spec:
|
||||||
- containerPort: 8443
|
- containerPort: 8443
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
args:
|
args:
|
||||||
- --tls-key-file=/certs/dashboard.key
|
- --tls-key-file=/certs/{{ dashboard_tls_key_file }}
|
||||||
- --tls-cert-file=/certs/dashboard.crt
|
- --tls-cert-file=/certs/{{ dashboard_tls_cert_file }}
|
||||||
- --authentication-mode=token{% if kube_basic_auth|default(false) %},basic{% endif %}
|
- --authentication-mode=token{% if kube_basic_auth|default(false) %},basic{% endif %}
|
||||||
# Uncomment the following line to manually specify Kubernetes API server Host
|
# 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
|
# If not specified, Dashboard will attempt to auto discover the API server and connect
|
||||||
|
@ -172,7 +174,7 @@ spec:
|
||||||
volumes:
|
volumes:
|
||||||
- name: kubernetes-dashboard-certs
|
- name: kubernetes-dashboard-certs
|
||||||
secret:
|
secret:
|
||||||
secretName: kubernetes-dashboard-certs
|
secretName: {{ dashboard_certs_secret_name }}
|
||||||
- name: tmp-volume
|
- name: tmp-volume
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
serviceAccountName: kubernetes-dashboard
|
serviceAccountName: kubernetes-dashboard
|
||||||
|
|
Loading…
Reference in a new issue