diff --git a/down/offline_images b/down/offline_images deleted file mode 100644 index d541c43..0000000 --- a/down/offline_images +++ /dev/null @@ -1,53 +0,0 @@ -###---[basic_images ] - -calico/node:v3.4.4 -calico/cni:v3.4.4 -calico/kube-controllers:v3.4.4 - -coredns/coredns:1.5.0 - -mirrorgooglecontainers/kubernetes-dashboard-amd64:v1.10.1 - -easzlab/flannel:v0.11.0-amd64 - -mirrorgooglecontainers/heapster-amd64:v1.5.4 - -mirrorgooglecontainers/metrics-server-amd64:v0.3.3 - -mirrorgooglecontainers/pause-amd64:3.1 - -traefik:v1.7.12 - -###---[extra-images] -# kube-dns -mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.13 -mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.13 -mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.13 -# cilium -cilium/cilium:v1.4.4 -# kube-router -cloudnativelabs/kube-router:v0.3.1 -# heapster -mirrorgooglecontainers/heapster-grafana-amd64:v4.4.3 -mirrorgooglecontainers/heapster-amd64:v1.5.4 -mirrorgooglecontainers/heapster-influxdb-amd64:v1.5.2 -# helm tiller server -easzlab/tiller:v2.14.1 -# efk -easzlab/elasticsearch:v6.6.1 -easzlab/es-index-rotator:0.1.3 -alpine:3.6 -mirrorgooglecontainers/fluentd-elasticsearch:v2.4.0 -easzlab/kibana-oss:6.6.1 -# nfs dynamic PV provisioner -jmgao1983/nfs-client-provisioner:latest -# prometheus -busybox:latest -grafana/grafana:5.1.2 -mirrorgooglecontainers/kube-state-metrics:v1.3.1 -appropriate/curl:latest -prom/prometheus:v2.2.1 -prom/alertmanager:v0.14.0 -prom/node-exporter:v0.15.2 -jimmidyson/configmap-reload:v0.1 - diff --git a/manifests/metrics-server/metrics-server-deployment.yaml b/manifests/metrics-server/metrics-server-deployment.yaml index 9c1241a..526b118 100644 --- a/manifests/metrics-server/metrics-server-deployment.yaml +++ b/manifests/metrics-server/metrics-server-deployment.yaml @@ -5,7 +5,7 @@ metadata: name: metrics-server namespace: kube-system --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: metrics-server @@ -29,8 +29,8 @@ spec: emptyDir: {} containers: - name: metrics-server - #image: k8s.gcr.io/metrics-server-amd64:v0.3.3 - image: mirrorgooglecontainers/metrics-server-amd64:v0.3.3 + #image: k8s.gcr.io/metrics-server-amd64:v0.3.4 + image: mirrorgooglecontainers/metrics-server-amd64:v0.3.4 imagePullPolicy: IfNotPresent command: - /metrics-server diff --git a/roles/cluster-addon/defaults/main.yml b/roles/cluster-addon/defaults/main.yml index 00338b0..e2c4c05 100644 --- a/roles/cluster-addon/defaults/main.yml +++ b/roles/cluster-addon/defaults/main.yml @@ -4,7 +4,7 @@ dns_backend: "coredns" # 设置 dns svc ip (这里选用 SERVICE_CIDR 中第2个IP) CLUSTER_DNS_SVC_IP: "{{ SERVICE_CIDR | ipaddr('net') | ipaddr(2) | ipaddr('address') }}" kubednsVer: "1.14.13" -corednsVer: "1.5.0" +corednsVer: "1.6.2" kubedns_offline: "kubedns_{{ kubednsVer }}.tar" coredns_offline: "coredns_{{ corednsVer }}.tar" dns_offline: "{%- if dns_backend == 'coredns' -%} \ @@ -15,7 +15,7 @@ dns_offline: "{%- if dns_backend == 'coredns' -%} \ # metric server 自动安装 metricsserver_install: "yes" -metricsVer: "v0.3.3" +metricsVer: "v0.3.4" metricsserver_offline: "metrics-server_{{ metricsVer }}.tar" # dashboard 自动安装 diff --git a/roles/cluster-addon/templates/coredns.yaml.j2 b/roles/cluster-addon/templates/coredns.yaml.j2 index 99739a7..a798356 100644 --- a/roles/cluster-addon/templates/coredns.yaml.j2 +++ b/roles/cluster-addon/templates/coredns.yaml.j2 @@ -67,7 +67,7 @@ data: loadbalance } --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: coredns diff --git a/tools/easzup b/tools/easzup index 8e13b3f..168b290 100755 --- a/tools/easzup +++ b/tools/easzup @@ -14,7 +14,7 @@ set -o errexit #set -o xtrace # default version, can be overridden by cmd line options -export DOCKER_VER=18.09.8 +export DOCKER_VER=18.09.9 export KUBEASZ_VER=2.0.3 export K8S_BIN_VER=v1.15.2 export EXT_BIN_VER=0.3.0 @@ -183,11 +183,11 @@ function get_sys_pkg() { function get_offline_image() { # images needed by k8s cluster calicoVer=v3.4.4 - corednsVer=1.5.0 + corednsVer=1.6.2 dashboardVer=v1.10.1 flannelVer=v0.11.0-amd64 heapsterVer=v1.5.4 - metricsVer=v0.3.3 + metricsVer=v0.3.4 pauseVer=3.1 traefikVer=v1.7.12