test

kubernetes-sigs · Sep 21, 2023 · d626f60 · d626f60
1 parent 0725bee
commit d626f60
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/test/e2e/data/ccm/gce-cloud-controller-manager.yaml b/test/e2e/data/ccm/gce-cloud-controller-manager.yaml
@@ -68,18 +68,18 @@ spec:
             # These took a bit of trial and error, most of them probably aren't universally applicable, as we run cilium without
             #  kube-proxy and use Shared VPC + Secondary VPC Ranges for "native" routing (https://docs.cilium.io/en/stable/network/concepts/routing/#google-cloud)
             # - --cluster-name=my-cluster
-            # - --cluster-cidr=10.0.0.0/8
-            # - --allocate-node-cidrs=true
-            # - --configure-cloud-routes=false
-            # - --cidr-allocator-type=CloudAllocator
-            # - --controllers=cloud-node,cloud-node-lifecycle,nodeipam,service
+            - --cluster-cidr=10.0.0.0/8
+            - --allocate-node-cidrs=true
+            - --configure-cloud-routes=false
+            - --cidr-allocator-type=CloudAllocator
+            - --controllers=cloud-node,cloud-node-lifecycle,nodeipam,service
           env:
             # This probably won't work when running HA controlplanes, but without kube-proxy we don't get DNS resolution
             # for services until cilium is up and running, which doesn't happen until after CCM itself is deployed.
-            - name: KUBERNETES_SERVICE_HOST
-              value: "127.0.0.1"
-            - name: KUBERNETES_SERVICE_PORT
-              value: "6443"
+            # - name: KUBERNETES_SERVICE_HOST
+            #   value: "127.0.0.1"
+            # - name: KUBERNETES_SERVICE_PORT
+            #   value: "6443"
           # volumeMounts:
           #   - mountPath: /etc/kubernetes/cloud.config
           #     name: cloudconfig
@@ -96,6 +96,12 @@ metadata:
   name: cloud-controller-manager
   namespace: kube-system
 ---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: system:cloud-controller-manager
+  namespace: kube-system
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -142,6 +148,8 @@ rules:
   verbs:
   - get
   - update
+  - create
+  - delete
 - apiGroups:
   - ""
   resources:
@@ -176,6 +184,7 @@ rules:
   - ""
   resources:
   - secrets
+  - configmaps
   verbs:
   - create
   - delete