Fix remaining Cilium manifests and update hashes

Signed-off-by: Maciej Kwiek <[email protected]>
kubernetes · Sep 16, 2019 · 7fd24b9 · 7fd24b9
1 parent 2ad6963
commit 7fd24b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template
@@ -204,13 +204,6 @@ kind: ClusterRole
 metadata:
   name: cilium-operator
 rules:
-- apiGroups:
-  - ""
-  resources:
-  # to get k8s version and status
-  - componentstatuses
-  verbs:
-  - get
 - apiGroups:
   - ""
   resources:
@@ -232,6 +225,8 @@ rules:
   # to perform the translation of a CNP that contains `ToGroup` to its endpoints
   - services
   - endpoints
+  # to check apiserver connectivity
+  - namespaces
   verbs:
   - get
   - list

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -107,15 +107,15 @@ spec:
   - id: k8s-1.7
     kubernetesVersion: '>=1.7.0 <1.12.0'
     manifest: networking.cilium.io/k8s-1.7.yaml
-    manifestHash: a66bde86dd1e1ef7e2f16f828c7520d2b1a2fa91
+    manifestHash: 54942553181df199c9be734897ad7047395edc15
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"
     version: v1.0-kops.2
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: a66bde86dd1e1ef7e2f16f828c7520d2b1a2fa91
+    manifestHash: 54942553181df199c9be734897ad7047395edc15
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"