version bump to k8s 1.11.8 (#64)

nwcdheap · Mar 31, 2019 · a03a032 · a03a032
1 parent fe5be8b
commit a03a032
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -8,21 +8,21 @@ MASTER_SIZE ?= m4.large
 NODE_SIZE ?= c5.large
 NODE_COUNT ?= 2
 SSH_PUBLIC_KEY ?= ~/.ssh/id_rsa.pub
-KUBERNETES_VERSION ?= v1.11.7
+KUBERNETES_VERSION ?= v1.11.8
 KOPS_VERSION ?= 1.11.1
 
 # do not modify following values
 AWS_DEFAULT_REGION ?= $(TARGET_REGION)
 AWS_REGION ?= $(AWS_DEFAULT_REGION)
 ifeq ($(TARGET_REGION) ,cn-north-1)
 	CLUSTER_NAME ?= cluster.bjs.k8s.local
-	AMI ?= ami-0caaf17a3032c1b56
+	AMI ?= 	ami-01e99c7e0a343d325
 	ZONES ?= cn-north-1a,cn-north-1b
 endif
 
 ifeq ($(TARGET_REGION) ,cn-northwest-1)
 	CLUSTER_NAME ?= cluster.zhy.k8s.local
-	AMI ?= ami-0a863f3b0a0720e6a
+	AMI ?= ami-0773341917796083a
 	ZONES ?= cn-northwest-1a,cn-northwest-1b,cn-northwest-1c
 endif
 

diff --git a/README.md b/README.md
@@ -42,9 +42,9 @@ https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kops/1.11.1/linux
 //kops for mac os
 https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kops/1.11.1/darwin/amd64/kops
 //kubectl for linux
-https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.7/bin/linux/amd64/kubectl
+https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.8/bin/linux/amd64/kubectl
 //kubectl for mac os
-https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.7/bin/darwin/amd64/kubectl
+https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.8/bin/darwin/amd64/kubectl
 ```
 
 
@@ -58,9 +58,9 @@ https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-releas
 | **KOPS_STATE_STORE** | 您需要提供一个S3桶给KOPS存放配置信息 | `s3://YOUR_S3_BUCKET_NANME` |
 | **VPCID** | 选择将您的集群部署在哪个VPC中 | **vpc-xxxxxxxx** |
 | **MASTER_COUNT** | master节点的机器数量 | **3** (建议不要修改) |
-| **MASTER_SIZE** | master节点的机器类型 | | 
-| **NODE_SIZE** | 工作节点的机器类型 | | 
-| **NODE_COUNT** | 工作节点的机器数量 | | 
+| **MASTER_SIZE** | master节点的机器类型 | |
+| **NODE_SIZE** | 工作节点的机器类型 | |
+| **NODE_COUNT** | 工作节点的机器数量 | |
 | **SSH_PUBLIC_KEY** | 本地ssh公钥的存放路径 |**~/.ssh/id_rsa.pub** [default] |
 | **KUBERNETES_VERSION** | 指定kubernetes版本 |(建议不要修改)  |
 | **KOPS_VERSION** | 指定kops版本 | (建议不要修改) |
@@ -93,7 +93,7 @@ make update-cluster
 
 ```
 kops validate cluster
-``` 
+```
 或是
 ```
 make validate-cluster

diff --git a/README_en.md b/README_en.md
@@ -34,9 +34,9 @@ https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kops/1.11.1/linux
 //kops for mac os
 https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kops/1.11.1/darwin/amd64/kops
 //kubectl for linux
-https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.7/bin/linux/amd64/kubectl
+https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.8/bin/linux/amd64/kubectl
 //kubectl for mac os
-https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.7/bin/darwin/amd64/kubectl
+https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-release/release/v1.11.8/bin/darwin/amd64/kubectl
 ```
 
 
@@ -50,9 +50,9 @@ https://s3.cn-north-1.amazonaws.com.cn/kops-bjs/fileRepository/kubernetes-releas
 | **KOPS_STATE_STORE** | Your private S3 bucket to save Kops state | `s3://YOUR_S3_BUCKET_NANME` |
 | **VPCID** | The existing VPC ID to deploy the cluster | **vpc-xxxxxxxx** |
 | **MASTER_COUNT** | number of the master nodes | **3** (recommended to leave it as is) |
-| **MASTER_SIZE** | instance type of the master nodes | | 
-| **NODE_SIZE** | instance type of the node group | | 
-| **NODE_COUNT** | instance number of the node group | | 
+| **MASTER_SIZE** | instance type of the master nodes | |
+| **NODE_SIZE** | instance type of the node group | |
+| **NODE_COUNT** | instance number of the node group | |
 | **SSH_PUBLIC_KEY** | your ssh public key file path at your client |**~/.ssh/id_rsa.pub** [default] |
 | **KUBERNETES_VERSION** | current kubernetes version | |
 | **KOPS_VERSION** | current kops version ||
@@ -86,13 +86,13 @@ It may take 3-5 minutes before you can
 
 ```
 kops validate cluster
-``` 
+```
 
 or 
 
 ```
 make validate-cluster
-``` 
+```
 
 to validate it as `ready`