C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix run dashboard error

Browse source
This commit is contained in:
rong.zhang 2018-01-04 13:02:33 +08:00
parent 5aef52e8c0
commit 6ed2a60978
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes-apps/ansible/defaults/main.yml
View file

@ -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

15
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
View file

@ -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:
- 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:
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