Merge pull request #8445 from daviddyball/master

Cilium - Add missing Identity Allocation Mode to Operator Template
kubernetes · Feb 3, 2020 · 051ceee · 051ceee
2 parents 4c6b874 + f1e40fe
commit 051ceee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
@@ -542,9 +542,16 @@ spec:
       containers:
       - args:
         - --debug=$(CILIUM_DEBUG)
+        - --identity-allocation-mode=$(CILIUM_IDENTITY_ALLOCATION_MODE)
         command:
         - cilium-operator
         env:
+        - name: CILIUM_IDENTITY_ALLOCATION_MODE
+          valueFrom:
+            configMapKeyRef:
+              key: identity-allocation-mode
+              name: cilium-config
+              optional: true
         - name: CILIUM_K8S_NAMESPACE
           valueFrom:
             fieldRef:
@@ -632,4 +639,4 @@ spec:
       hostNetwork: true
       restartPolicy: Always
       serviceAccount: cilium-operator
-      serviceAccountName: cilium-operator
+      serviceAccountName: cilium-operator
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -97,7 +97,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: b36181e5522a41b1726362e138ad87df87839a68
+    manifestHash: 47d2613d2d7380172350417e1cd282ea7cf893c3
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"