Set Primary Network IP as Node IP

hetznercloud · Jul 19, 2019 · 19caf8a · 19caf8a
1 parent 9b0eb8f
commit 19caf8a
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 78 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,14 +2,14 @@ dist: xenial
 language: go
 go:
   - 1.12
-  - docker pull lkdevelopment/hetzner-cloud-api-mock
-  - docker run -d -p 127.0.0.1:4000:8080 lkdevelopment/hetzner-cloud-api-mock
-  - docker ps -a
-  - sleep 10
 env:
   - GO111MODULE=on
 before_script:
   - go get golang.org/x/lint/golint
+  - docker pull lkdevelopment/hetzner-cloud-api-mock
+  - docker run -d -p 127.0.0.1:4000:8080 lkdevelopment/hetzner-cloud-api-mock
+  - docker ps -a
+  - sleep 10
 script:
   - make test
   - make
diff --git a/deploy/development-networks.yaml b/deploy/development-networks.yaml
@@ -0,0 +1,81 @@
+# NOTE: this release was tested against kubernetes v1.15.x
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: cloud-controller-manager
+  namespace: kube-system
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: system:cloud-controller-manager
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: cloud-controller-manager
+    namespace: kube-system
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: hcloud-cloud-controller-manager
+  namespace: kube-system
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  template:
+    metadata:
+      labels:
+        app: hcloud-cloud-controller-manager
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+    spec:
+      serviceAccount: cloud-controller-manager
+      dnsPolicy: Default
+      tolerations:
+        # this taint is set by all kubelets running `--cloud-provider=external`
+        # so we should tolerate it to schedule the cloud controller manager
+        - key: "node.cloudprovider.kubernetes.io/uninitialized"
+          value: "true"
+          effect: "NoSchedule"
+        - key: "CriticalAddonsOnly"
+          operator: "Exists"
+        # cloud controller manages should be able to run on masters
+        - key: "node-role.kubernetes.io/master"
+          effect: NoSchedule
+        - key: "node.kubernetes.io/not-ready"
+          effect: "NoSchedule"
+      hostNetwork: true
+      containers:
+        - image: hetznercloud/hcloud-cloud-controller-manager:v1.4.0-b1
+          name: hcloud-cloud-controller-manager
+          command:
+            - "/bin/hcloud-cloud-controller-manager"
+            - "--cloud-provider=hcloud"
+            - "--leader-elect=false"
+            - "--allow-untagged-cloud"
+            - "--allocate-node-cidrs=true"
+            - "--cluster-cidr=10.244.0.0/16"
+          resources:
+            requests:
+              cpu: 100m
+              memory: 50Mi
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: HCLOUD_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: hcloud
+                  key: token
+            - name: HCLOUD_NETWORK
+              valueFrom:
+                secretKeyRef:
+                  name: hcloud
+                  key: network
diff --git a/deploy/development.yaml b/deploy/development.yaml
@@ -1,4 +1,4 @@
-# NOTE: this release was tested against kubernetes v1.9.x - 1.12.x
+# NOTE: this release was tested against kubernetes v1.15.x
 
 ---
 apiVersion: v1
@@ -16,9 +16,9 @@ roleRef:
   kind: ClusterRole
   name: cluster-admin
 subjects:
-- kind: ServiceAccount
-  name: cloud-controller-manager
-  namespace: kube-system
+  - kind: ServiceAccount
+    name: cloud-controller-manager
+    namespace: kube-system
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -38,39 +38,42 @@ spec:
       serviceAccount: cloud-controller-manager
       dnsPolicy: Default
       tolerations:
-      # this taint is set by all kubelets running `--cloud-provider=external`
-      # so we should tolerate it to schedule the cloud controller manager
-      - key: "node.cloudprovider.kubernetes.io/uninitialized"
-        value: "true"
-        effect: "NoSchedule"
-      - key: "CriticalAddonsOnly"
-        operator: "Exists"
-      # cloud controller manages should be able to run on masters
-      - key: "node-role.kubernetes.io/master"
-        effect: NoSchedule
+        # this taint is set by all kubelets running `--cloud-provider=external`
+        # so we should tolerate it to schedule the cloud controller manager
+        - key: "node.cloudprovider.kubernetes.io/uninitialized"
+          value: "true"
+          effect: "NoSchedule"
+        - key: "CriticalAddonsOnly"
+          operator: "Exists"
+        # cloud controller manages should be able to run on masters
+        - key: "node-role.kubernetes.io/master"
+          effect: NoSchedule
+        - key: "node.kubernetes.io/not-ready"
+          effect: "NoSchedule"
       containers:
-      - image: hetznercloud/hcloud-cloud-controller-manager:latest
-        name: hcloud-cloud-controller-manager
-        command:
-        - "/bin/hcloud-cloud-controller-manager"
-        - "--cloud-provider=hcloud"
-        - "--leader-elect=false"
-        - "--allow-untagged-cloud"
-        resources:
-          requests:
-            cpu: 100m
-            memory: 50Mi
-        env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name: HCLOUD_TOKEN
-          valueFrom:
-            secretKeyRef:
-              name: hcloud
-              key: token
-        - name: HCLOUD_NETWORK
-            valueFrom:
-              name: hcloud
-              key: network
+        - image: hetznercloud/hcloud-cloud-controller-manager:v1.4.0-b1
+          name: hcloud-cloud-controller-manager
+          command:
+            - "/bin/hcloud-cloud-controller-manager"
+            - "--cloud-provider=hcloud"
+            - "--leader-elect=false"
+            - "--allow-untagged-cloud"
+          resources:
+            requests:
+              cpu: 100m
+              memory: 50Mi
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: HCLOUD_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: hcloud
+                  key: token
+            - name: HCLOUD_NETWORK
+              valueFrom:
+                secretKeyRef:
+                  name: hcloud
+                  key: network
diff --git a/go.mod b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
 	github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
-	github.com/hetznercloud/hcloud-go v1.13.0
+	github.com/hetznercloud/hcloud-go v1.14.0
 	github.com/imdario/mergo v0.0.0-20180119215619-163f41321a19 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jonboulle/clockwork v0.1.0 // indirect
@@ -83,5 +83,3 @@ require (
 	k8s.io/kubernetes v1.11.1
 	sigs.k8s.io/yaml v1.1.0 // indirect
 )
-
-replace github.com/hetznercloud/hcloud-go => ../../hetznercloud/hcloud-go
diff --git a/go.sum b/go.sum
@@ -73,6 +73,8 @@ github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 h1:UnszMmmmm5
 github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hetznercloud/hcloud-go v1.12.0 h1:ugZO8a8ADekqSWi7xWlcs6pxr4QE0tw5VnyjXcL5n28=
 github.com/hetznercloud/hcloud-go v1.12.0/go.mod h1:g5pff0YNAZywQaivY/CmhUYFVp7oP0nu3MiODC2W4Hw=
+github.com/hetznercloud/hcloud-go v1.14.0 h1:6IdF0Vox/6j1pyEdUCbFPIzEH/K9xZZzVuSFro8Y2vw=
+github.com/hetznercloud/hcloud-go v1.14.0/go.mod h1:8lR3yHBHZWy2uGcUi9Ibt4UOoop2wrVdERJgCtxsF3Q=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/imdario/mergo v0.0.0-20180119215619-163f41321a19 h1:geJOJJZwkYI1yqxWrAMcgrwDvy4P1XyNNgIyN9d6UXc=
 github.com/imdario/mergo v0.0.0-20180119215619-163f41321a19/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=

diff --git a/hcloud/instances.go b/hcloud/instances.go
@@ -19,6 +19,7 @@ package hcloud
 import (
 	"context"
 	"k8s.io/kubernetes/pkg/cloudprovider"
+	"os"
 	"strconv"
 
 	"github.com/hetznercloud/hcloud-go/hcloud"
@@ -44,15 +45,15 @@ func (i *instances) NodeAddressesByProviderID(ctx context.Context, providerID st
 	if err != nil {
 		return nil, err
 	}
-	return nodeAddresses(server), nil
+	return i.nodeAddresses(ctx, server), nil
 }
 
 func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName) ([]v1.NodeAddress, error) {
 	server, err := getServerByName(ctx, i.client, string(nodeName))
 	if err != nil {
 		return nil, err
 	}
-	return nodeAddresses(server), nil
+	return i.nodeAddresses(ctx, server), nil
 }
 
 func (i *instances) ExternalID(ctx context.Context, nodeName types.NodeName) (string, error) {
@@ -128,12 +129,27 @@ func (i instances) InstanceShutdownByProviderID(ctx context.Context, providerID
 	return
 }
 
-func nodeAddresses(server *hcloud.Server) []v1.NodeAddress {
+func (i *instances) nodeAddresses(ctx context.Context, server *hcloud.Server) []v1.NodeAddress {
 	var addresses []v1.NodeAddress
 	addresses = append(
 		addresses,
 		v1.NodeAddress{Type: v1.NodeHostName, Address: server.Name},
 		v1.NodeAddress{Type: v1.NodeExternalIP, Address: server.PublicNet.IPv4.IP.String()},
 	)
+	n := os.Getenv(hcloudNetworkENVVar)
+	if len(n) > 0 {
+		network, _, _ := i.client.Network.Get(ctx, n)
+		if network != nil {
+			for _, privateNet := range server.PrivateNet {
+				if privateNet.Network.ID == network.ID {
+					addresses = append(
+						addresses,
+						v1.NodeAddress{Type: v1.NodeInternalIP, Address: privateNet.IP.String()},
+					)
+				}
+			}
+
+		}
+	}
 	return addresses
 }