Add weave-net as an alternative CNI plugin

Makefile

@@ -15,10 +15,9 @@
 export GOPATH?=$(shell go env GOPATH)
 export CGO_ENABLED=0
 export TFJSON?=
-export KUBEONE_CONFIG_FILE?=config.yaml.dist
-export KUBERNETES_VERSION=1.13.3
+export KUBERNETES_VERSION=1.14.1
 BUILD_DATE=$(shell if hash gdate 2>/dev/null; then gdate --rfc-3339=seconds | sed 's/ /T/'; else date --rfc-3339=seconds | sed 's/ /T/'; fi)
-BUILD_IMAGE?=golang:1.11.5
+BUILD_IMAGE?=golang:1.12.5
 GITCOMMIT=$(shell git log -1 --pretty=format:"%H")
 GITTAG=$(shell git describe --tags --always)
 GOLDFLAGS?=-s -w -X github.com/kubermatic/kubeone/pkg/cmd.version=$(GITTAG) -X github.com/kubermatic/kubeone/pkg/cmd.commit=$(GITCOMMIT) -X github.com/kubermatic/kubeone/pkg/cmd.date=$(BUILD_DATE)
@@ -82,9 +81,11 @@ $(CREATE_TARGETS): kubeone
 	for host in $$(cat tf.json |jq -r '.kubeone_hosts.value.control_plane[0].public_address|.[]'); do \
 		until ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(USER)@$$host exit; do sleep 1; done; \
 	done
-	./dist/kubeone install config.yaml.dist  --tfjson tf.json
+	./dist/kubeone config print --full --provider $(PROVIDERNAME) > ./dist/fresh_config.yaml
+	./dist/kubeone install ./dist/fresh_config.yaml  --tfjson tf.json
 
 $(DESTROY_TARGETS): kubeone
 	$(eval PROVIDERNAME := $(@:-env-cleanup=))
-	./dist/kubeone reset config.yaml.dist  --tfjson tf.json
+	./dist/kubeone config print --full --provider $(PROVIDERNAME) > ./dist/fresh_config.yaml
+	./dist/kubeone reset ./dist/fresh_config.yaml  --tfjson tf.json
 	cd terraform/$(PROVIDERNAME) && terraform destroy --auto-approve

README.md

@@ -106,8 +106,7 @@ about the infrastructure.
 kubeone install config.yaml --tfjson tf.json
 ```
 
-To learn more about KubeOne configuration, check out
-[the example configuration file][12].
+To learn more about KubeOne configuration, please run `kubeone config print --full`.
 
 For advanced use cases and other features, check the [KubeOne features][13]
 document.
@@ -154,7 +153,6 @@ See [the list of releases][3] to find out about feature changes.
 [9]: https://github.com/kubermatic/kubeone/releases
 [10]: ./docs
 [11]: ./docs/quickstart-aws.md
-[12]: ./config.yaml.dist
 [13]: https://github.com/kubermatic/kubeone#features
 [14]: https://groups.google.com/forum/#!forum/loodse-dev
 [15]: http://slack.kubermatic.io/

docs/quickstart-aws.md

@@ -91,9 +91,12 @@ terraform output -json > tf.json
 
 ## Installing Kubernetes
 
-Now that you have infrastructure you can proceed with installing Kubernetes using KubeOne.
+Now that you have infrastructure you can proceed with installing Kubernetes
+using KubeOne.
 
-Before you start you'll need a configuration file that defines how Kubernetes will be installed, e.g. what version will be used and what features will be enabled. For the configuration file reference see [`config.yaml.dist`](https://github.com/kubermatic/kubeone/blob/master/config.yaml.dist).
+Before you start you'll need a configuration file that defines how Kubernetes
+will be installed, e.g. what version will be used and what features will be
+enabled. For the configuration file reference run `kubeone config print --full`.
 
 To get started you can use the following configuration. It'll install Kubernetes 1.14.1 and create 3 worker nodes. KubeOne automatically populates all needed information about worker nodes from the [Terraform output](https://github.com/kubermatic/kubeone/blob/ec8bf305446ac22529e9683fd4ce3c9abf753d1e/examples/terraform/aws/output.tf#L38-L87). Alternatively, you can set those information manually. As KubeOne is using [Kubermatic `machine-controller`](https://github.com/kubermatic/machine-controller) for creating worker nodes, see [AWS example manifest](https://github.com/kubermatic/machine-controller/blob/master/examples/aws-machinedeployment.yaml) for available options.
 

docs/quickstart-digitalocean.md

@@ -90,7 +90,9 @@ terraform output -json > tf.json
 
 Now that you have infrastructure you can proceed with installing Kubernetes using KubeOne.
 
-Before you start you'll need a configuration file that defines how Kubernetes will be installed, e.g. what version will be used and what features will be enabled. For the configuration file reference see [`config.yaml.dist`](https://github.com/kubermatic/kubeone/blob/master/config.yaml.dist).
+Before you start you'll need a configuration file that defines how Kubernetes
+will be installed, e.g. what version will be used and what features will be
+enabled. For the configuration file reference run `kubeone config print --full`.
 
 To get started you can use the following configuration. It'll install Kubernetes 1.14.1, create 3 worker nodes and deploy the [external cloud controller manager](https://github.com/digitalocean/digitalocean-cloud-controller-manager). The external cloud controller manager takes care of providing correct information about nodes from the DigitalOcean API and allows you to use the `type: LoadBalancer` services. KubeOne automatically populates information about the worker nodes from the [Terraform output](https://github.com/kubermatic/kubeone/blob/ec8bf305446ac22529e9683fd4ce3c9abf753d1e/examples/terraform/digitalocean/output.tf#L38-L59). Alternatively, you can set those information manually. As KubeOne is using [Kubermatic `machine-controller`](https://github.com/kubermatic/machine-controller) for creating worker nodes, see [DigitalOcean example manifest](https://github.com/kubermatic/machine-controller/blob/master/examples/digitalocean-machinedeployment.yaml) for available options.
 

docs/quickstart-gce.md

@@ -135,8 +135,7 @@ using KubeOne.
 
 Before you start you'll need a configuration file that defines how Kubernetes
 will be installed, e.g. what version will be used and what features will be
-enabled. For the configuration file reference see
-[`config.yaml.dist`](https://github.com/kubermatic/kubeone/blob/master/config.yaml.dist).
+enabled. For the configuration file reference run `kubeone config print --full`.
 
 To get started you can use the following configuration. It'll install Kubernetes
 1.14.1 and create 3 worker nodes. KubeOne automatically populates information

docs/quickstart-hetzner.md

@@ -81,9 +81,12 @@ terraform output -json > tf.json
 
 ## Installing Kubernetes
 
-Now that you have infrastructure you can proceed with installing Kubernetes using KubeOne.
+Now that you have infrastructure you can proceed with installing Kubernetes
+using KubeOne.
 
-Before you start you'll need a configuration file that defines how Kubernetes will be installed, e.g. what version will be used and what features will be enabled. For the configuration file reference see [`config.yaml.dist`](https://github.com/kubermatic/kubeone/blob/master/config.yaml.dist).
+Before you start you'll need a configuration file that defines how Kubernetes
+will be installed, e.g. what version will be used and what features will be
+enabled. For the configuration file reference run `kubeone config print --full`.
 
 To get started you can use the following configuration. It'll install Kubernetes 1.14.1, create 3 worker nodes and deploy the [external cloud controller manager](https://github.com/hetznercloud/hcloud-cloud-controller-manager). The external cloud controller manager takes care of providing correct information about the nodes. KubeOne automatically populates all needed information about worker nodes from the [Terraform output](https://github.com/kubermatic/kubeone/blob/a874fd5913ca2a86c3b8136982c2a00e835c2f62/examples/terraform/hetzner/output.tf#L26-L36). Alternatively, you can set those information manually. As KubeOne is using [Kubermatic `machine-controller`](https://github.com/kubermatic/machine-controller) for creating worker nodes see [Hetzner example manifest](https://github.com/kubermatic/machine-controller/blob/master/examples/hetzner-machinedeployment.yaml) for available options.
 

docs/quickstart-openstack.md

@@ -103,9 +103,12 @@ terraform output -json > tf.json
 
 ## Installing Kubernetes
 
-Now that you have infrastructure you can proceed with installing Kubernetes using KubeOne.
+Now that you have infrastructure you can proceed with installing Kubernetes
+using KubeOne.
 
-Before you start you'll need a configuration file that defines how Kubernetes will be installed, e.g. what version will be used and what features will be enabled. For the configuration file reference see [`config.yaml.dist`](https://github.com/kubermatic/kubeone/blob/master/config.yaml.dist).
+Before you start you'll need a configuration file that defines how Kubernetes
+will be installed, e.g. what version will be used and what features will be
+enabled. For the configuration file reference run `kubeone config print --full`.
 
 To get started you can use the following configuration. It'll install Kubernetes 1.14.1 and create 2 worker nodes. KubeOne automatically populates information about image, instance size and networking settings for worker nodes from the Terraform output. Alternatively, you can set those information manually. As KubeOne is using [Kubermatic `machine-controller`](https://github.com/kubermatic/machine-controller) for creating worker nodes, see [OpenStack example manifest](https://github.com/kubermatic/machine-controller/blob/master/examples/openstack-machinedeployment.yaml) for available options.
 

docs/quickstart-packet.md

@@ -130,8 +130,7 @@ using KubeOne.
 
 Before you start you'll need a configuration file that defines how Kubernetes
 will be installed, e.g. what version will be used and what features will be
-enabled. For the configuration file reference see
-[`config.yaml.dist`][config_yaml_dist].
+enabled. For the configuration file reference run `kubeone config print --full`.
 
 To get started you can use the following configuration. It'll install Kubernetes
 1.14.1, create 1 worker node and deploy the 
@@ -272,7 +271,6 @@ our [documentation][kubeone_docs].
 [packet_support_docs]: https://support.packet.com/kb/articles/api-integrations
 [packet_terraform]: https://github.com/kubermatic/kubeone/tree/master/examples/terraform/packet
 [packet_variables]: https://github.com/kubermatic/kubeone/blob/master/examples/terraform/packet/variables.tf
-[config_yaml_dist]: https://github.com/kubermatic/kubeone/blob/master/config.yaml.dist
 [packet_ccm]: https://github.com/packethost/packet-ccm
 [packet_tf_output]: https://github.com/kubermatic/kubeone/blob/789509f54b3a4aed7b15cd8b27b2e5bb2a4fa6c1/examples/terraform/packet/output.tf
 [machine_controller]: https://github.com/kubermatic/machine-controller

pkg/apis/kubeone/types.go

@@ -111,6 +111,36 @@ type ClusterNetworkConfig struct {
 	ServiceSubnet     string `json:"serviceSubnet"`
 	ServiceDomainName string `json:"serviceDomainName"`
 	NodePortRange     string `json:"nodePortRange"`
+	CNI               *CNI   `json:"cni,omitempty"`
+}
+
+// CNIProvider type
+type CNIProvider string
+
+// List of CNI Providers
+const (
+	// CNIProviderCanal is a Canal CNI plugin (Flannel + Calico).
+	// Highlights:
+	// * Support Network Policies
+	// * Does not support traffic encryption
+	// More info: https://docs.projectcalico.org/v3.7/getting-started/kubernetes/installation/flannel
+	CNIProviderCanal CNIProvider = "canal"
+
+	// CNIProviderWeaveNet is a WeaveNet CNI plugin.
+	// Highlights:
+	// * Support Network Policies
+	// * Support optional traffic encryption
+	// * In case when encryption is enabled, strong secret will be autogenerated
+	// More info: https://www.weave.works/docs/net/latest/kubernetes/kube-addon/
+	CNIProviderWeaveNet CNIProvider = "weave-net"
+)
+
+// CNI config
+type CNI struct {
+	// Provider choice
+	Provider CNIProvider `json:"provider"`
+	// Encrypted enables encryption for supported CNI plugins
+	Encrypted bool `json:"encrypted"`
 }
 
 // ProxyConfig configures proxy for the Docker daemon and is used by KubeOne scripts

pkg/apis/kubeone/v1alpha1/defaults.go

@@ -86,6 +86,11 @@ func SetDefaults_ClusterNetwork(obj *KubeOneCluster) {
 	if len(obj.ClusterNetwork.NodePortRange) == 0 {
 		obj.ClusterNetwork.NodePortRange = DefaultNodePortRange
 	}
+	if obj.ClusterNetwork.CNI == nil {
+		obj.ClusterNetwork.CNI = &CNI{
+			Provider: CNIProviderCanal,
+		}
+	}
 }
 
 func SetDefaults_MachineController(obj *KubeOneCluster) {