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
6ed2a609
Commit
6ed2a609
authored
7 years ago
by
rong.zhang
Browse files
Options
Downloads
Patches
Plain Diff
fix run dashboard error
parent
5aef52e8
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
+1
-1
1 addition, 1 deletion
roles/kubernetes-apps/ansible/defaults/main.yml
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+5
-10
5 additions, 10 deletions
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
with
6 additions
and
11 deletions
roles/kubernetes-apps/ansible/defaults/main.yml
+
1
−
1
View file @
6ed2a609
...
@@ -41,7 +41,7 @@ netchecker_server_memory_requests: 64M
...
@@ -41,7 +41,7 @@ netchecker_server_memory_requests: 64M
# Dashboard
# Dashboard
dashboard_enabled
:
true
dashboard_enabled
:
true
dashboard_image_repo
:
gcr.io/google_containers/kubernetes-dashboard-amd64
dashboard_image_repo
:
gcr.io/google_containers/kubernetes-dashboard-amd64
dashboard_image_tag
:
v1.8.
0
dashboard_image_tag
:
v1.8.
1
dashboard_init_image_repo
:
gcr.io/google_containers/kubernetes-dashboard-init-amd64
dashboard_init_image_repo
:
gcr.io/google_containers/kubernetes-dashboard-init-amd64
dashboard_init_image_tag
:
v1.0.1
dashboard_init_image_tag
:
v1.0.1
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+
5
−
10
View file @
6ed2a609
...
@@ -140,7 +140,7 @@ spec:
...
@@ -140,7 +140,7 @@ spec:
labels:
labels:
k8s-app: kubernetes-dashboard
k8s-app: kubernetes-dashboard
spec:
spec:
{% if
not
dashboard_use_custom_certs %}
{% if 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 }}
...
@@ -163,23 +163,20 @@ spec:
...
@@ -163,23 +163,20 @@ spec:
- containerPort: 8443
- containerPort: 8443
protocol: TCP
protocol: TCP
args:
args:
{% if
not
dashboard_use_custom_certs %}
{% if dashboard_use_custom_certs %}
- --tls-key-file=
/certs/
{{ dashboard_tls_key_file }}
- --tls-key-file={{ dashboard_tls_key_file }}
- --tls-cert-file=
/certs/
{{ dashboard_tls_cert_file }}
- --tls-cert-file={{ 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 %}
{% else %}
{% else %}
- --auto-generate-certificates
- --auto-generate-certificates
{% endif %}
{% endif %}
{% 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
# to it. Uncomment only if the default does not work.
# to it. Uncomment only if the default does not work.
# - --apiserver-host=http://my-address:port
# - --apiserver-host=http://my-address:port
volumeMounts:
volumeMounts:
{% if not dashboard_use_custom_certs %}
- name: kubernetes-dashboard-certs
- name: kubernetes-dashboard-certs
mountPath: /certs
mountPath: /certs
{% endif %}
# Create on-disk volume to store exec logs
# Create on-disk volume to store exec logs
- mountPath: /tmp
- mountPath: /tmp
name: tmp-volume
name: tmp-volume
...
@@ -191,11 +188,9 @@ spec:
...
@@ -191,11 +188,9 @@ spec:
initialDelaySeconds: 30
initialDelaySeconds: 30
timeoutSeconds: 30
timeoutSeconds: 30
volumes:
volumes:
{% if not dashboard_use_custom_certs %}
- name: kubernetes-dashboard-certs
- name: kubernetes-dashboard-certs
secret:
secret:
secretName: kubernetes-dashboard-certs
secretName: {{ dashboard_certs_secret_name }}
{% endif %}
- name: tmp-volume
- name: tmp-volume
emptyDir: {}
emptyDir: {}
serviceAccountName: kubernetes-dashboard
serviceAccountName: kubernetes-dashboard
...
...
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