update kube-dns 1.14.13, heapster v1.5.4

pull/349/head
gjmzj 2018-10-14 12:02:33 +08:00
parent 68029132d6
commit c0b4c8d977
3 changed files with 19 additions and 11 deletions

View File

@ -39,13 +39,21 @@ spec:
serviceAccountName: heapster serviceAccountName: heapster
containers: containers:
- name: heapster - name: heapster
#image: gcr.io/google_containers/heapster-amd64:v1.5.1 #image: gcr.io/google_containers/heapster-amd64:v1.5.4
image: mirrorgooglecontainers/heapster-amd64:v1.5.1 image: mirrorgooglecontainers/heapster-amd64:v1.5.4
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- /heapster - /heapster
- --source=kubernetes:https://kubernetes.default #- --source=kubernetes:https://kubernetes.default
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb.kube-system.svc:8086 - --sink=influxdb:http://monitoring-influxdb.kube-system.svc:8086
livenessProbe:
httpGet:
path: /healthz
port: 8082
scheme: HTTP
initialDelaySeconds: 180
timeoutSeconds: 5
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service

View File

@ -1,7 +1,7 @@
# dns 自动安装,可选"coredns"和“kubedns” # dns 自动安装,可选"coredns"和“kubedns”
dns_install: "yes" dns_install: "yes"
dns_backend: "coredns" dns_backend: "coredns"
kubedns_offline: "kubedns_1.14.10.tar" kubedns_offline: "kubedns_1.14.13.tar"
coredns_offline: "coredns_1.2.2.tar" coredns_offline: "coredns_1.2.2.tar"
dns_offline: "{%- if dns_backend == 'coredns' -%} \ dns_offline: "{%- if dns_backend == 'coredns' -%} \
{{ coredns_offline }} \ {{ coredns_offline }} \
@ -24,7 +24,7 @@ traefik_offline: "traefik_v1.6.tar"
# heapster 自动安装 # heapster 自动安装
heapster_install: "no" heapster_install: "no"
heapster_offline: "heapster_v1.5.1.tar" heapster_offline: "heapster_v1.5.4.tar"
# efk 自动安装 # efk 自动安装
#efk_install: "no" #efk_install: "no"

View File

@ -79,8 +79,8 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
#image: gcr.io/google_containers/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.10 image: mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.13
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@ -131,8 +131,8 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
#image: gcr.io/google_containers/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.10 image: mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -170,8 +170,8 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar - name: sidecar
#image: gcr.io/google_containers/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.10 image: mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics