Skip to content

Commit

Permalink
update metrics-server v0.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
gjmzj committed Oct 5, 2018
1 parent 9eeb3dd commit 64e3871
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions down/offline_images
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
###---[basic_images ]
# dns-addon
coredns/coredns:1.1.3
coredns/coredns:1.2.2
mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.10
mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.10
mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.10
# metrics-server
mirrorgooglecontainers/metrics-server-amd64:v0.2.1
mirrorgooglecontainers/metrics-server-amd64:v0.3.1
# calico
calico/node:v3.1.3
calico/cni:v3.1.3
Expand Down
16 changes: 13 additions & 3 deletions manifests/metrics-server/metrics-server-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,21 @@ spec:
k8s-app: metrics-server
spec:
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:
- name: metrics-server
#image: gcr.io/google_containers/metrics-server-amd64:v0.2.1
image: mirrorgooglecontainers/metrics-server-amd64:v0.2.1
#image: k8s.gcr.io/metrics-server-amd64:v0.3.0
image: mirrorgooglecontainers/metrics-server-amd64:v0.3.1
imagePullPolicy: IfNotPresent
command:
- /metrics-server
- --source=kubernetes.summary_api:''
- --metric-resolution=30s
- --kubelet-port=10255
- --deprecated-kubelet-completely-insecure=true
volumeMounts:
- name: tmp-dir
mountPath: /tmp

4 changes: 2 additions & 2 deletions roles/cluster-addon/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
dns_install: "yes"
dns_backend: "coredns"
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' -%} \
{{ coredns_offline }} \
{%- else -%} \
Expand All @@ -11,7 +11,7 @@ dns_offline: "{%- if dns_backend == 'coredns' -%} \

# metric server 自动安装
metricsserver_install: "yes"
metricsserver_offline: "metrics-server_v0.2.1.tar"
metricsserver_offline: "metrics-server_v0.3.1.tar"

# dashboard 自动安装
dashboard_install: "yes"
Expand Down

0 comments on commit 64e3871

Please sign in to comment.