Algorithm for finding default external network for metal-ccm deployme…

…nt. (#92)
metal-stack · Sep 10, 2020 · 642ee99 · 642ee99
1 parent 057910d
commit 642ee99
Show file tree

Hide file tree

Showing 13 changed files with 239 additions and 15 deletions.
diff --git a/charts/images.yaml b/charts/images.yaml
@@ -2,7 +2,7 @@ images:
 - name: metalccm
   sourceRepository: github.com/metal-stack/metal-ccm
   repository: metalstack/metal-ccm
-  tag: v0.3.0
+  tag: v0.5.0
 - name: machine-controller-manager
   sourceRepository: github.com/gardener/machine-controller-manager
   repository: eu.gcr.io/gardener-project/gardener/machine-controller-manager

diff --git a/charts/internal/control-plane/templates/cloud-controller-manager.yaml b/charts/internal/control-plane/templates/cloud-controller-manager.yaml
@@ -97,6 +97,8 @@ spec:
             value: {{ .Values.cloudControllerManager.networkID }}
           - name: METAL_CLUSTER_ID
             value: {{ .Values.cloudControllerManager.clusterID }}
+          - name: METAL_DEFAULT_EXTERNAL_NETWORK_ID
+            value: {{ .Values.cloudControllerManager.defaultExternalNetwork }}
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/charts/internal/control-plane/values.yaml b/charts/internal/control-plane/values.yaml
@@ -19,6 +19,7 @@ cloudControllerManager:
   partitionID: partition-id
   networkID: network-id
   clusterID: cluster-id
+  defaultExternalNetwork: external-network-id
   metal:
     endpoint: api-url
   resources:

diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml
@@ -14,7 +14,7 @@ spec:
   deployment:
     type: helm
     providerConfig:
-      chart: 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
+      chart: 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
       values:
         image:
-          tag: v0.12.0
+          tag: v0.12.1
diff --git a/go.mod b/go.mod
@@ -16,13 +16,13 @@ require (
 	github.com/gardener/machine-controller-manager v0.33.0
 	github.com/go-logr/logr v0.1.0
 	github.com/gobuffalo/packr/v2 v2.8.0
-	github.com/golang/mock v1.4.4-0.20200731163441-8734ec565a4d
+	github.com/golang/mock v1.4.4
 	github.com/google/go-cmp v0.5.2
-	github.com/google/uuid v1.1.1
+	github.com/google/uuid v1.1.2
 	github.com/imdario/mergo v0.3.8
 	github.com/metal-stack/firewall-controller v0.1.8
 	github.com/metal-stack/metal-go v0.8.3
-	github.com/metal-stack/metal-lib v0.5.0
+	github.com/metal-stack/metal-lib v0.6.1
 	github.com/onsi/ginkgo v1.14.0
 	github.com/onsi/gomega v1.10.1
 	github.com/pkg/errors v0.9.1