Update kubernetes to v1.18.0

xetys · Mar 28, 2020 · c56c6da · c56c6da
1 parent 5ee89ce
commit c56c6da
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/cmd/version.go b/cmd/version.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	"github.com/xetys/hetzner-kube/pkg/clustermanager"
 )
 
 // Version The current version of hetzner-kube.
@@ -15,7 +16,8 @@ var versionCmd = &cobra.Command{
 	Aliases: []string{"v"},
 	Short:   "prints the current version",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(version)
+		fmt.Printf("Application: %s\n", version)
+		fmt.Printf("Kubernetes:  %s\n", clustermanager.KubernetesVersion)
 	},
 }
 

diff --git a/pkg/clustermanager/cluster.go b/pkg/clustermanager/cluster.go
@@ -10,6 +10,8 @@ import (
 
 const rewriteTpl = `cat /etc/kubernetes/%s | sed -e 's/server: https\(.*\)/server: https:\/\/127.0.0.1:16443/g' > /tmp/cp && mv /tmp/cp /etc/kubernetes/%s`
 
+const KubernetesVersion = "1.18.0"
+
 // Manager is the structure used to mange cluster
 type Manager struct {
 	nodes            []Node
@@ -74,7 +76,7 @@ func (manager *Manager) Cluster() Cluster {
 		IsolatedEtcd:      manager.isolatedEtcd,
 		CloudInitFile:     manager.cloudInitFile,
 		NodeCIDR:          manager.clusterProvider.GetNodeCidr(),
-		KubernetesVersion: "1.16.4",
+		KubernetesVersion: KubernetesVersion,
 	}
 }
 

diff --git a/pkg/clustermanager/configs_test.go b/pkg/clustermanager/configs_test.go
@@ -9,7 +9,7 @@ import (
 func TestGenerateMasterConfiguration(t *testing.T) {
 	expectedConf := `apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.16.4
+kubernetesVersion: v1.18.0
 networking:
   serviceSubnet: "10.96.0.0/12"
   podSubnet: "10.244.0.0/16"
@@ -45,7 +45,7 @@ featureGates:
 
 	expectedConfWithEtcd := `apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.16.4
+kubernetesVersion: v1.18.0
 networking:
   serviceSubnet: "10.96.0.0/12"
   podSubnet: "10.244.0.0/16"
@@ -88,15 +88,13 @@ featureGates:
 		{Name: "node2", IPAddress: "1.1.1.2", PrivateIPAddress: "10.0.0.2"},
 	}
 
-	kubernetesVersion := "1.16.4"
-
-	noEtcdConf := GenerateMasterConfiguration(nodes[0], nodes, nil, kubernetesVersion)
+	noEtcdConf := GenerateMasterConfiguration(nodes[0], nodes, nil, KubernetesVersion)
 
 	if noEtcdConf != expectedConf {
 		t.Errorf("master config without etcd does not match to expected.\n%s\n", diff.LineDiff(noEtcdConf, expectedConf))
 	}
 
-	etcdConf := GenerateMasterConfiguration(nodes[0], nodes, nodes, kubernetesVersion)
+	etcdConf := GenerateMasterConfiguration(nodes[0], nodes, nodes, KubernetesVersion)
 
 	if etcdConf != expectedConfWithEtcd {
 		t.Errorf("master config with etcd does not match to expected.\n%s\n", diff.LineDiff(etcdConf, expectedConfWithEtcd))