From 8a291c7929ea9da24a954edeba91402d599d507a Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Sun, 7 Apr 2019 22:04:06 +0200 Subject: [PATCH 1/2] fix CSI issue --- pkg/clustermanager/configs.go | 4 ++++ pkg/clustermanager/configs_test.go | 8 ++++++++ pkg/clustermanager/provision_node.go | 1 - 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/clustermanager/configs.go b/pkg/clustermanager/configs.go index 69d44014..f2448eca 100644 --- a/pkg/clustermanager/configs.go +++ b/pkg/clustermanager/configs.go @@ -9,11 +9,15 @@ import ( func GenerateMasterConfiguration(masterNode Node, masterNodes []Node, etcdNodes []Node) string { masterConfigTpl := `apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration +kubernetesVersion: stable networking: serviceSubnet: "10.96.0.0/12" podSubnet: "10.244.0.0/16" dnsDomain: "cluster.local" apiServer: + featureGates: + CSINodeInfo: true + CSIDriverRegistry: true certSANs: - 127.0.0.1 - %s diff --git a/pkg/clustermanager/configs_test.go b/pkg/clustermanager/configs_test.go index 60aa0310..d153bc37 100644 --- a/pkg/clustermanager/configs_test.go +++ b/pkg/clustermanager/configs_test.go @@ -9,11 +9,15 @@ import ( func TestGenerateMasterConfiguration(t *testing.T) { expectedConf := `apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration +kubernetesVersion: stable networking: serviceSubnet: "10.96.0.0/12" podSubnet: "10.244.0.0/16" dnsDomain: "cluster.local" apiServer: + featureGates: + CSINodeInfo: true + CSIDriverRegistry: true certSANs: - 127.0.0.1 - 1.1.1.1 @@ -40,11 +44,15 @@ featureGates: expectedConfWithEtcd := `apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration +kubernetesVersion: stable networking: serviceSubnet: "10.96.0.0/12" podSubnet: "10.244.0.0/16" dnsDomain: "cluster.local" apiServer: + featureGates: + CSINodeInfo: true + CSIDriverRegistry: true certSANs: - 127.0.0.1 - 1.1.1.1 diff --git a/pkg/clustermanager/provision_node.go b/pkg/clustermanager/provision_node.go index 57ea1072..e318aac4 100644 --- a/pkg/clustermanager/provision_node.go +++ b/pkg/clustermanager/provision_node.go @@ -248,7 +248,6 @@ func (provisioner *NodeProvisioner) updateAndInstall() error { // Last step because otherwise we need create script to check if variables already set and replaces them // As soon as it is last step we are ok to set them in basic way func (provisioner *NodeProvisioner) setSystemWideEnvironment() error { - provisioner.eventService.AddEvent(provisioner.node.Name, "set environment variables") var err error From cdcd180914e7ab653a2381ce2a967d98f2bd8f01 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Sun, 7 Apr 2019 23:17:41 +0200 Subject: [PATCH 2/2] update to kubernetes 1.14 --- pkg/clustermanager/provision_node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/clustermanager/provision_node.go b/pkg/clustermanager/provision_node.go index e318aac4..242ff774 100644 --- a/pkg/clustermanager/provision_node.go +++ b/pkg/clustermanager/provision_node.go @@ -11,7 +11,7 @@ import ( const maxErrors = 3 // K8sVersion is the version that will be used to install kubernetes -var K8sVersion = flag.String("k8s-version", "1.13.4-00", "The version of the k8s debian packages that will be used during provisioning") +var K8sVersion = flag.String("k8s-version", "1.14.0-00", "The version of the k8s debian packages that will be used during provisioning") // NodeProvisioner provisions all basic packages to install docker, kubernetes and wireguard type NodeProvisioner struct {