Upgrade machinecontroller to v1.2.0 (#490)

* Upgrade machinecontroller to v1.2.0

* add support for proxies in worker nodes

Signed-off-by: Artiom Diomin <[email protected]>

* Update cluster-api to match the machinecontroller

Signed-off-by: Artiom Diomin <[email protected]>

* Add comment to config about proxy settings for worker nodes

Signed-off-by: Artiom Diomin <[email protected]>

Gopkg.toml

@@ -53,7 +53,7 @@ required = [
 
 [[constraint]]
   name = "sigs.k8s.io/cluster-api"
-  revision = "c63bf6f67ab631a449b6eb76dfe29458441051e0"
+  revision = "2ec456177c0e8f0a903f4e746d44baaae54cc591"
 
 [[constraint]]
   name = "sigs.k8s.io/controller-runtime"
@@ -74,6 +74,3 @@ required = [
   non-go = false
   go-tests = false
   unused-packages = false
-[[constraint]]
-  name = "github.com/cpuguy83/go-md2man"
-  revision = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5"

pkg/cmd/config.go

@@ -532,6 +532,9 @@ machineController:
 # Proxy is used to configure HTTP_PROXY, HTTPS_PROXY and NO_PROXY
 # for Docker daemon and kubelet, and to be used when provisioning cluster
 # (e.g. for curl, apt-get..).
+# Also worker nodes managed by machine-controller will be configred according to
+# proxy settings here. The caveat is that only proxy.http and proxy.noProxy will
+# be used on worker machines.
 # proxy:
 #  http: '{{ .HTTPProxy }}'
 #  https: '{{ .HTTPSProxy }}'

pkg/templates/machinecontroller/deployment.go

@@ -44,7 +44,7 @@ const (
 	MachineControllerNamespace     = metav1.NamespaceSystem
 	MachineControllerAppLabelKey   = "app"
 	MachineControllerAppLabelValue = "machine-controller"
-	MachineControllerTag           = "v1.1.9"
+	MachineControllerTag           = "v1.2.0"
 )
 
 // Deploy deploys MachineController deployment with RBAC on the cluster
@@ -727,6 +727,14 @@ func machineControllerDeployment(cluster *kubeoneapi.KubeOneCluster) (*appsv1.De
 		"-cluster-dns", clusterDNS.String(),
 	}
 
+	if cluster.Proxy.HTTP != "" {
+		args = append(args, "-node-http-proxy", cluster.Proxy.HTTP)
+	}
+
+	if cluster.Proxy.NoProxy != "" {
+		args = append(args, "-node-no-proxy", cluster.Proxy.NoProxy)
+	}
+
 	if cluster.CloudProvider.External {
 		args = append(args, "-external-cloud-provider")
 	}