Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
df21fc86
Commit
df21fc86
authored
7 years ago
by
rong.zhang
Browse files
Options
Downloads
Patches
Plain Diff
Remove initContainer
parent
6ed2a609
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes-apps/ansible/defaults/main.yml
+4
-4
4 additions, 4 deletions
roles/kubernetes-apps/ansible/defaults/main.yml
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+1
-9
1 addition, 9 deletions
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
with
5 additions
and
13 deletions
roles/kubernetes-apps/ansible/defaults/main.yml
+
4
−
4
View file @
df21fc86
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+
1
−
9
View file @
df21fc86
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment