From 60f21c4cb0310130ca5e4ed085cf56c7e00df5c6 Mon Sep 17 00:00:00 2001 From: pixiake Date: Thu, 2 Jul 2020 16:13:00 +0800 Subject: [PATCH] add more K8s versions --- README.md | 6 +++--- cmd/cluster.go | 2 +- cmd/config.go | 2 +- pkg/files/file.go | 9 +++++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index aa254b76..b38d9d0a 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ There are three scenarios to use KubeKey. ### Kubernetes Versions * **v1.15**:   *v1.15.12* -* **v1.16**:   *v1.16.10* -* **v1.17**:   *v1.17.6* (default) -* **v1.18**:   *v1.18.3* +* **v1.16**:   *v1.16.12* +* **v1.17**:   *v1.17.8* (default) +* **v1.18**:   *v1.18.5* ## Requirements and Recommendations diff --git a/cmd/cluster.go b/cmd/cluster.go index cce61855..f5b06879 100644 --- a/cmd/cluster.go +++ b/cmd/cluster.go @@ -47,6 +47,6 @@ func init() { createCmd.AddCommand(clusterCmd) clusterCmd.Flags().StringVarP(&clusterCfgFile, "file", "f", "", "Path to a configuration file") - clusterCmd.Flags().StringVarP(&kubernetes, "with-kubernetes", "", "v1.17.6", "Specify a supported version of kubernetes") + clusterCmd.Flags().StringVarP(&kubernetes, "with-kubernetes", "", "v1.17.8", "Specify a supported version of kubernetes") clusterCmd.Flags().BoolVarP(&kubesphere, "with-kubesphere", "", false, "Deploy a specific version of kubesphere (default v3.0.0)") } diff --git a/cmd/config.go b/cmd/config.go index fbf79769..c6bd9de1 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -46,6 +46,6 @@ func init() { configCmd.Flags().StringVarP(&addons, "with-storage", "", "", "Add storage plugins") configCmd.Flags().StringVarP(&name, "name", "", "config-sample", "Specify a name of cluster object") configCmd.Flags().StringVarP(&clusterCfgPath, "file", "f", "", "Specify a configuration file path") - configCmd.Flags().StringVarP(&kubernetes, "with-kubernetes", "", "v1.17.6", "Specify a supported version of kubernetes") + configCmd.Flags().StringVarP(&kubernetes, "with-kubernetes", "", "v1.17.8", "Specify a supported version of kubernetes") configCmd.Flags().BoolVarP(&kubesphere, "with-kubesphere", "", false, "Deploy a specific version of kubesphere (default v3.0.0)") } diff --git a/pkg/files/file.go b/pkg/files/file.go index 29a966b0..d2a819dd 100644 --- a/pkg/files/file.go +++ b/pkg/files/file.go @@ -41,10 +41,13 @@ var ( amd64: { "v1.15.12": "e052bae41e731921a9197b4d078c30d33fac5861716dc275bfee4670addbac9b", "v1.16.10": "726d42c569f25078d03b758477f17f543c845aef2ff48acd9d4269705ca1aa9d", + "v1.16.12": "bb4d0f045600b883745016416c14533f823d582f4f20df691b7f79a6545b6480", "v1.17.4": "3cdcffcf8a1660241a045cfdfed3ebbf7f7c6a0840f008e2b049b533bca5bb8c", "v1.17.5": "9bd2fd1118b3d07d12e2a806c04bf34d99e79886c5318ddc003ba38f30da390c", "v1.17.6": "d4cfc9a0a734ba015594974ee4253b8965b95cdb6e83d8a6a946675aad418b40", + "v1.17.8": "c59b85696c4cbabe896ba71f4bbc99e4ad2444fcea851e3ee740705584420aad", "v1.18.3": "a60974e9840e006076d204fd4ddcba96213beba10fb89ff01882095546c9684d", + "v1.18.5": "e428fc9d1cf860090346a83eb66082c3be6b6032f0db9e4f8e6d52492d46231f", }, arm64: { "v1.15.12": "dfc1af35cccac89099a7e9a48dcc4b0d956a8b1d4dfcdd2be12191b6f6c384a3", @@ -54,10 +57,13 @@ var ( amd64: { "v1.15.12": "dff48393a3116b8f7dea206b81678e52f7fad298f1aff976f18f1bfa4e9ccdde", "v1.16.10": "82b38f444d11c2436040165b1addf46d0909a6daec9133cc979678835ef8e14b", + "v1.16.12": "fbc8c16b148dbb3234a3e13f80e6c6736557c10f8c046edfb1dc5337fe2dd40f", "v1.17.4": "f3a427ddf610b568db60c8d47565041901220e1bbe257614b61bb4c76801d765", "v1.17.5": "c5fbfa83444bdeefb51934c29f0b4b7ffc43ce5a98d7f957d8a11e3440055383", "v1.17.6": "4b7fd5123bfafe2249bf91ed83469c2655a8d3295966e5fbd952f89b64b75f57", + "v1.17.8": "b39081fb40332ae12d262b04dc81630e5c6550fb196f09b60f3d726283dff17f", "v1.18.3": "6aac8853028a4f185de5ccb5b41b3fbd87726161445dee56f351e3e51442d669", + "v1.18.5": "8c328f65d30f0edd0fd4f529b09d6fc588cfb7b524d5c9f181e36de6e494e19c", }, arm64: { "v1.15.12": "c7f586a77acdb3c3e27a6b3bd749760538b830414575f8718f03f7ce53b138d8", @@ -67,10 +73,13 @@ var ( amd64: { "v1.15.12": "a32b762279c33cb8d8f4198f3facdae402248c3164e9b9b664c3afbd5a27472e", "v1.16.10": "246d36e4ce67e74e95ff2ba578b9189f58e5def0e8830a24cd30fa3cf279742f", + "v1.16.12": "db72e5c90de59e1bf287bef55eaf0b603c8d74b3dc552f356ccc02b08c2eb348", "v1.17.4": "465b2d2bd7512b173860c6907d8127ee76a19a385aa7865608e57a5eebe23597", "v1.17.5": "03cd1fa19f90d38005148793efdb17a9b58d01dedea641a8496b9cf228db3ab4", "v1.17.6": "5e245f6af6fb761fbe4b3ac06b753f33b361ce0486c48c85b45731a7ee5e4cca", + "v1.17.8": "01283cbc2b09555cbf2a71c162097552a62a4fd48a0a4c06e34e9b853b815486", "v1.18.3": "6fcf70aae5bc64870c358fac153cdfdc93f55d8bae010741ecce06bb14c083ea", + "v1.18.5": "69d9b044ffaf544a4d1d4b40272f05d56aaf75d7e3c526d5418d1d3c78249e45", }, arm64: { "v1.15.12": "ef9a4272d556851c645d6788631a2993823260a7e1176a281620284b4c3406da",