Skip to content

Commit 7cfc664

Browse files
authored
Merge pull request #272 from mavimo/fix-issue-csi
Fix CSI issue and upgrade to kubernetes 1.14.0
2 parents 083b356 + cdcd180 commit 7cfc664

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

pkg/clustermanager/configs.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ import (
99
func GenerateMasterConfiguration(masterNode Node, masterNodes []Node, etcdNodes []Node) string {
1010
masterConfigTpl := `apiVersion: kubeadm.k8s.io/v1beta1
1111
kind: ClusterConfiguration
12+
kubernetesVersion: stable
1213
networking:
1314
serviceSubnet: "10.96.0.0/12"
1415
podSubnet: "10.244.0.0/16"
1516
dnsDomain: "cluster.local"
1617
apiServer:
18+
featureGates:
19+
CSINodeInfo: true
20+
CSIDriverRegistry: true
1721
certSANs:
1822
- 127.0.0.1
1923
%s%s

pkg/clustermanager/configs_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ import (
99
func TestGenerateMasterConfiguration(t *testing.T) {
1010
expectedConf := `apiVersion: kubeadm.k8s.io/v1beta1
1111
kind: ClusterConfiguration
12+
kubernetesVersion: stable
1213
networking:
1314
serviceSubnet: "10.96.0.0/12"
1415
podSubnet: "10.244.0.0/16"
1516
dnsDomain: "cluster.local"
1617
apiServer:
18+
featureGates:
19+
CSINodeInfo: true
20+
CSIDriverRegistry: true
1721
certSANs:
1822
- 127.0.0.1
1923
- 1.1.1.1
@@ -41,11 +45,15 @@ featureGates:
4145

4246
expectedConfWithEtcd := `apiVersion: kubeadm.k8s.io/v1beta1
4347
kind: ClusterConfiguration
48+
kubernetesVersion: stable
4449
networking:
4550
serviceSubnet: "10.96.0.0/12"
4651
podSubnet: "10.244.0.0/16"
4752
dnsDomain: "cluster.local"
4853
apiServer:
54+
featureGates:
55+
CSINodeInfo: true
56+
CSIDriverRegistry: true
4957
certSANs:
5058
- 127.0.0.1
5159
- 1.1.1.1

pkg/clustermanager/provision_node.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
const maxErrors = 3
1212

1313
// K8sVersion is the version that will be used to install kubernetes
14-
var K8sVersion = flag.String("k8s-version", "1.13.4-00", "The version of the k8s debian packages that will be used during provisioning")
14+
var K8sVersion = flag.String("k8s-version", "1.14.0-00", "The version of the k8s debian packages that will be used during provisioning")
1515

1616
// NodeProvisioner provisions all basic packages to install docker, kubernetes and wireguard
1717
type NodeProvisioner struct {
@@ -248,7 +248,6 @@ func (provisioner *NodeProvisioner) updateAndInstall() error {
248248
// Last step because otherwise we need create script to check if variables already set and replaces them
249249
// As soon as it is last step we are ok to set them in basic way
250250
func (provisioner *NodeProvisioner) setSystemWideEnvironment() error {
251-
252251
provisioner.eventService.AddEvent(provisioner.node.Name, "set environment variables")
253252
var err error
254253

0 commit comments

Comments
 (0)