diff --git a/README.md b/README.md index d66e2df..26924d6 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,13 @@ ## 组件版本 -1. kubernetes v1.8.4 -1. etcd v3.2.10 -1. docker 17.09.0-ce -1. calico/node v2.6.2 +1. kubernetes v1.9.0 +1. etcd v3.2.11 +1. docker 17.09.1-ce +1. calico/node v2.6.3 -附:集群用到的所有二进制文件已打包好供下载 [https://pan.baidu.com/s/1eSetFSA](https://pan.baidu.com/s/1eSetFSA) +附:集群用到的所有二进制文件已打包好供下载 [https://pan.baidu.com/s/1i5u3SEh](https://pan.baidu.com/s/1i5u3SEh) +注:`Kubernetes v1.8.x` 版本请切换到项目分支 `v1.8` ## 快速指南 diff --git a/bin/VERSION.md b/bin/VERSION.md index c7c0518..b4f6a9a 100644 --- a/bin/VERSION.md +++ b/bin/VERSION.md @@ -1,5 +1,6 @@ # 主要组件版本 -kubernetes v1.8.4 -etcd v3.2.10 -docker 17.09.0-ce -calico/node v2.6.2 + ++ kubernetes v1.9.0 ++ etcd v3.2.11 ++ docker 17.09.1-ce ++ calico/node v2.6.3 diff --git a/manifests/dashboard/kubernetes-dashboard.yaml b/manifests/dashboard/kubernetes-dashboard.yaml index af1a44e..3ea72ea 100644 --- a/manifests/dashboard/kubernetes-dashboard.yaml +++ b/manifests/dashboard/kubernetes-dashboard.yaml @@ -41,7 +41,7 @@ subjects: namespace: kube-system --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: labels: k8s-app: kubernetes-dashboard diff --git a/manifests/heapster/grafana.yaml b/manifests/heapster/grafana.yaml index 5862fbd..642a49f 100644 --- a/manifests/heapster/grafana.yaml +++ b/manifests/heapster/grafana.yaml @@ -1,5 +1,5 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: monitoring-grafana diff --git a/manifests/heapster/heapster.yaml b/manifests/heapster/heapster.yaml index d5fec8c..46e3a46 100644 --- a/manifests/heapster/heapster.yaml +++ b/manifests/heapster/heapster.yaml @@ -20,7 +20,7 @@ roleRef: apiGroup: rbac.authorization.k8s.io --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: heapster diff --git a/manifests/heapster/influxdb.yaml b/manifests/heapster/influxdb.yaml index 04973db..4df9e27 100644 --- a/manifests/heapster/influxdb.yaml +++ b/manifests/heapster/influxdb.yaml @@ -1,5 +1,5 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: monitoring-influxdb diff --git a/manifests/ingress/traefik-ingress.yaml b/manifests/ingress/traefik-ingress.yaml index 7254905..a729788 100644 --- a/manifests/ingress/traefik-ingress.yaml +++ b/manifests/ingress/traefik-ingress.yaml @@ -44,7 +44,7 @@ metadata: namespace: kube-system --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: name: traefik-ingress-controller namespace: kube-system diff --git a/manifests/kubedns/kubedns.yaml b/manifests/kubedns/kubedns.yaml index 636eae3..456296f 100644 --- a/manifests/kubedns/kubedns.yaml +++ b/manifests/kubedns/kubedns.yaml @@ -41,7 +41,7 @@ spec: protocol: TCP --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: kube-dns diff --git a/roles/calico/templates/calico-node.service.j2 b/roles/calico/templates/calico-node.service.j2 index aa0c7f0..1beb4db 100644 --- a/roles/calico/templates/calico-node.service.j2 +++ b/roles/calico/templates/calico-node.service.j2 @@ -28,7 +28,7 @@ ExecStart={{ bin_dir }}/docker run --net=host --privileged --name=calico-node \ -v /run/docker/plugins:/run/docker/plugins \ -v /var/run/docker.sock:/var/run/docker.sock \ -v /var/log/calico:/var/log/calico \ - calico/node:v2.6.2 + calico/node:v2.6.3 ExecStop={{ bin_dir }}/docker rm -f calico-node Restart=always RestartSec=10 diff --git a/roles/deploy/templates/kubedns.yaml.j2 b/roles/deploy/templates/kubedns.yaml.j2 index f8f2b72..ff5b71d 100644 --- a/roles/deploy/templates/kubedns.yaml.j2 +++ b/roles/deploy/templates/kubedns.yaml.j2 @@ -41,7 +41,7 @@ spec: protocol: TCP --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: kube-dns diff --git a/roles/kube-node/files/rbac.yaml b/roles/kube-node/files/rbac.yaml index e1398ef..d49e0c0 100644 --- a/roles/kube-node/files/rbac.yaml +++ b/roles/kube-node/files/rbac.yaml @@ -4,7 +4,7 @@ --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: calico-kube-controllers rules: @@ -21,7 +21,7 @@ rules: --- kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: calico-kube-controllers roleRef: diff --git a/roles/kube-node/templates/calico-kube-controllers.yaml.j2 b/roles/kube-node/templates/calico-kube-controllers.yaml.j2 index 5854b0f..f478635 100644 --- a/roles/kube-node/templates/calico-kube-controllers.yaml.j2 +++ b/roles/kube-node/templates/calico-kube-controllers.yaml.j2 @@ -1,11 +1,11 @@ -# Calico Version v2.6.2 -# https://docs.projectcalico.org/v2.6/releases#v2.6.2 +# Calico Version v2.6.3 +# https://docs.projectcalico.org/v2.6/releases#v2.6.3 # This manifest includes the following component versions: -# calico/kube-controllers:v1.0.0 +# calico/kube-controllers:v1.0.1 # Create this manifest using kubectl to deploy # the Calico Kubernetes controllers. -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: calico-kube-controllers @@ -20,6 +20,9 @@ spec: replicas: 1 strategy: type: Recreate + selector: + matchLabels: + k8s-app: calico-kube-controllers template: metadata: name: calico-kube-controllers @@ -31,8 +34,8 @@ spec: serviceAccountName: calico-kube-controllers containers: - name: calico-kube-controllers - #image: quay.io/calico/kube-controllers:v1.0.0 - image: calico/kube-controllers:v1.0.0 + #image: quay.io/calico/kube-controllers:v1.0.1 + image: calico/kube-controllers:v1.0.1 env: # Configure the location of your etcd cluster. - name: ETCD_ENDPOINTS