update metrics-server v0.3.1

pull/334/head
gjmzj 2018-10-05 09:47:03 +08:00
parent 9eeb3dd9d9
commit 64e38717dd
3 changed files with 17 additions and 7 deletions

View File

@ -1,11 +1,11 @@
###---[basic_images ] ###---[basic_images ]
# dns-addon # dns-addon
coredns/coredns:1.1.3 coredns/coredns:1.2.2
mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.10 mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.10
mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.10 mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.10
mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.10 mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.10
# metrics-server # metrics-server
mirrorgooglecontainers/metrics-server-amd64:v0.2.1 mirrorgooglecontainers/metrics-server-amd64:v0.3.1
# calico # calico
calico/node:v3.1.3 calico/node:v3.1.3
calico/cni:v3.1.3 calico/cni:v3.1.3

View File

@ -23,11 +23,21 @@ spec:
k8s-app: metrics-server k8s-app: metrics-server
spec: spec:
serviceAccountName: metrics-server serviceAccountName: metrics-server
volumes:
# mount in tmp so we can safely use from-scratch images and/or read-only containers
- name: tmp-dir
emptyDir: {}
containers: containers:
- name: metrics-server - name: metrics-server
#image: gcr.io/google_containers/metrics-server-amd64:v0.2.1 #image: k8s.gcr.io/metrics-server-amd64:v0.3.0
image: mirrorgooglecontainers/metrics-server-amd64:v0.2.1 image: mirrorgooglecontainers/metrics-server-amd64:v0.3.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- /metrics-server - /metrics-server
- --source=kubernetes.summary_api:'' - --metric-resolution=30s
- --kubelet-port=10255
- --deprecated-kubelet-completely-insecure=true
volumeMounts:
- name: tmp-dir
mountPath: /tmp

View File

@ -2,7 +2,7 @@
dns_install: "yes" dns_install: "yes"
dns_backend: "coredns" dns_backend: "coredns"
kubedns_offline: "kubedns_1.14.10.tar" kubedns_offline: "kubedns_1.14.10.tar"
coredns_offline: "coredns_1.1.3.tar" coredns_offline: "coredns_1.2.2.tar"
dns_offline: "{%- if dns_backend == 'coredns' -%} \ dns_offline: "{%- if dns_backend == 'coredns' -%} \
{{ coredns_offline }} \ {{ coredns_offline }} \
{%- else -%} \ {%- else -%} \
@ -11,7 +11,7 @@ dns_offline: "{%- if dns_backend == 'coredns' -%} \
# metric server 自动安装 # metric server 自动安装
metricsserver_install: "yes" metricsserver_install: "yes"
metricsserver_offline: "metrics-server_v0.2.1.tar" metricsserver_offline: "metrics-server_v0.3.1.tar"
# dashboard 自动安装 # dashboard 自动安装
dashboard_install: "yes" dashboard_install: "yes"