diff --git a/manifests/heapster/heapster.yaml b/manifests/heapster/heapster.yaml index 2163e6a..534bcd4 100644 --- a/manifests/heapster/heapster.yaml +++ b/manifests/heapster/heapster.yaml @@ -39,13 +39,21 @@ spec: serviceAccountName: heapster containers: - name: heapster - #image: gcr.io/google_containers/heapster-amd64:v1.5.1 - image: mirrorgooglecontainers/heapster-amd64:v1.5.1 + #image: gcr.io/google_containers/heapster-amd64:v1.5.4 + image: mirrorgooglecontainers/heapster-amd64:v1.5.4 imagePullPolicy: IfNotPresent command: - /heapster - - --source=kubernetes:https://kubernetes.default + #- --source=kubernetes:https://kubernetes.default + - --source=kubernetes.summary_api:'' - --sink=influxdb:http://monitoring-influxdb.kube-system.svc:8086 + livenessProbe: + httpGet: + path: /healthz + port: 8082 + scheme: HTTP + initialDelaySeconds: 180 + timeoutSeconds: 5 --- apiVersion: v1 kind: Service diff --git a/roles/cluster-addon/defaults/main.yml b/roles/cluster-addon/defaults/main.yml index 65add32..ecd0cdc 100644 --- a/roles/cluster-addon/defaults/main.yml +++ b/roles/cluster-addon/defaults/main.yml @@ -1,7 +1,7 @@ # dns 自动安装,可选"coredns"和“kubedns” dns_install: "yes" dns_backend: "coredns" -kubedns_offline: "kubedns_1.14.10.tar" +kubedns_offline: "kubedns_1.14.13.tar" coredns_offline: "coredns_1.2.2.tar" dns_offline: "{%- if dns_backend == 'coredns' -%} \ {{ coredns_offline }} \ @@ -24,7 +24,7 @@ traefik_offline: "traefik_v1.6.tar" # heapster 自动安装 heapster_install: "no" -heapster_offline: "heapster_v1.5.1.tar" +heapster_offline: "heapster_v1.5.4.tar" # efk 自动安装 #efk_install: "no" diff --git a/roles/cluster-addon/templates/kubedns.yaml.j2 b/roles/cluster-addon/templates/kubedns.yaml.j2 index 17aa40c..1bb13a7 100644 --- a/roles/cluster-addon/templates/kubedns.yaml.j2 +++ b/roles/cluster-addon/templates/kubedns.yaml.j2 @@ -79,8 +79,8 @@ spec: optional: true containers: - name: kubedns - #image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.10 - image: mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.10 + #image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13 + image: mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.13 resources: # TODO: Set memory limits when we've profiled the container for large # clusters, then set request = limit to keep this container in @@ -131,8 +131,8 @@ spec: - name: kube-dns-config mountPath: /kube-dns-config - name: dnsmasq - #image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.10 - image: mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.10 + #image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13 + image: mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.13 livenessProbe: httpGet: path: /healthcheck/dnsmasq @@ -170,8 +170,8 @@ spec: - name: kube-dns-config mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - #image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10 - image: mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.10 + #image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13 + image: mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.13 livenessProbe: httpGet: path: /metrics