Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CSI issue and upgrade to kubernetes 1.14.0 #272

Merged
merged 2 commits into from
May 8, 2019
Merged

Fix CSI issue and upgrade to kubernetes 1.14.0 #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a291c7
fix CSI issue
mavimo Apr 7, 2019
cdcd180
update to kubernetes 1.14
mavimo Apr 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/clustermanager/configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@ import (
func GenerateMasterConfiguration(masterNode Node, masterNodes []Node, etcdNodes []Node) string {
masterConfigTpl := `apiVersion: kubeadm.k8s.io/v1beta1
kind: ClusterConfiguration
kubernetesVersion: stable
xetys marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
8 changes: 8 additions & 0 deletions pkg/clustermanager/configs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pkg/clustermanager/provision_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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

Expand Down