bump cloud-provider-gcp to latest build

kubernetes · Oct 6, 2023 · e08472d · e08472d
1 parent d630f9c
commit e08472d
Show file tree

Hide file tree

Showing 31 changed files with 1,547 additions and 72 deletions.
diff --git a/pkg/model/components/gcpcloudcontrollermanager.go b/pkg/model/components/gcpcloudcontrollermanager.go
@@ -61,11 +61,11 @@ func (b *GCPCloudControllerManagerOptionsBuilder) BuildOptions(options interface
 	}
 
 	if ccmConfig.Controllers == nil {
-		changes := []string{"*,-gkenetworkparamset"}
+		changes := []string{"*"}
 
 		// Turn off some controllers if kops-controller is running them
 		if clusterSpec.IsKopsControllerIPAM() {
-			changes = append(changes, "-nodeipam", "-route")
+			changes = append(changes, "-node-ipam-controller", "-node-route-controller")
 		}
 
 		ccmConfig.Controllers = changes
@@ -75,7 +75,7 @@ func (b *GCPCloudControllerManagerOptionsBuilder) BuildOptions(options interface
 		// TODO: Implement CCM image publishing
 		switch b.KubernetesVersion.Minor {
 		default:
-			ccmConfig.Image = "registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v26.2.4"
+			ccmConfig.Image = "gcr.io/k8s-staging-cloud-provider-gcp/cloud-controller-manager:master"
 		}
 	}
 

diff --git a/tests/e2e/kubetest2-kops/deployer/dumplogs.go b/tests/e2e/kubetest2-kops/deployer/dumplogs.go
@@ -152,6 +152,8 @@ func (d *deployer) dumpClusterInfo() error {
 		"persistentvolumeclaims",
 		"poddisruptionbudgets",
 		"serviceaccounts",
+		"rolebindings",
+		"roles",
 	}
 	for _, namespace := range namespaces {
 		namespace = strings.TrimSpace(namespace)

diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go
@@ -150,11 +150,6 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		args = appendIfUnset(args, "--master-count", fmt.Sprintf("%d", d.ControlPlaneCount))
 	}
 
-	args = appendIfUnset(args, "--master-volume-size", "48")
-	args = appendIfUnset(args, "--node-count", "4")
-	args = appendIfUnset(args, "--node-volume-size", "48")
-	args = appendIfUnset(args, "--zones", strings.Join(zones, ","))
-
 	switch d.CloudProvider {
 	case "aws":
 		if isArm {
@@ -177,6 +172,7 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		// set some sane default e2e testing behaviour on gce
 		args = appendIfUnset(args, "--gce-service-account", "default")
 		args = appendIfUnset(args, "--networking", "kubenet")
+		args = appendIfUnset(args, "--node-volume-size", "100")
 
 		// We used to set the --vpc flag to split clusters into different networks, this is now the default.
 		// args = appendIfUnset(args, "--vpc", strings.Split(d.ClusterName, ".")[0])
@@ -185,6 +181,11 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		args = appendIfUnset(args, "--node-size", "c2-16vcpu-32gb")
 	}
 
+	args = appendIfUnset(args, "--master-volume-size", "48")
+	args = appendIfUnset(args, "--node-count", "4")
+	args = appendIfUnset(args, "--node-volume-size", "48")
+	args = appendIfUnset(args, "--zones", strings.Join(zones, ","))
+
 	if d.terraform != nil {
 		args = append(args, "--target", "terraform", "--out", d.terraform.Dir())
 	}

diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content
@@ -21,8 +21,8 @@ spec:
     clusterCIDR: 100.96.0.0/11
     clusterName: ha-gce-example-com
     controllers:
-    - '*,-gkenetworkparamset'
-    image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v26.2.4
+    - '*'
+    image: gcr.io/k8s-staging-cloud-provider-gcp/cloud-controller-manager:master
     leaderElection:
       leaderElect: true
   cloudProvider: gce

diff --git a/...tion/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content b/...tion/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content
@@ -62,7 +62,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.23
     manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml
-    manifestHash: dacbfa4c544a4b20b9354355f260c0513352d99830e549dcf78962e089d3bcd8
+    manifestHash: 002dac69385a975a8a2c4182981033e05880031c179dd1459ee569076cdce654
     name: gcp-cloud-controller.addons.k8s.io
     prune:
       kinds:

diff --git a/...s_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/...s_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
@@ -37,18 +37,16 @@ spec:
         - --cidr-allocator-type=CloudAllocator
         - --cluster-cidr=100.96.0.0/11
         - --cluster-name=ha-gce-example-com
-        - --controllers=*,-gkenetworkparamset
+        - --controllers=*
         - --leader-elect=true
         - --v=2
         - --cloud-provider=gce
         - --use-service-account-credentials=true
         - --cloud-config=/etc/kubernetes/cloud.config
-        command:
-        - /cloud-controller-manager
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v26.2.4
+        image: gcr.io/k8s-staging-cloud-provider-gcp/cloud-controller-manager:master
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -414,3 +412,155 @@ rules:
   verbs:
   - list
   - watch
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: gcp-cloud-controller.addons.k8s.io
+    addonmanager.kubernetes.io/mode: Reconcile
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: gcp-cloud-controller.addons.k8s.io
+  name: gce:cloud-provider
+  namespace: kube-system
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+  - get
+  - patch
+  - update
+  - list
+  - watch
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: gcp-cloud-controller.addons.k8s.io
+    addonmanager.kubernetes.io/mode: Reconcile
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: gcp-cloud-controller.addons.k8s.io
+  name: gce:cloud-provider
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - services/status
+  verbs:
+  - patch
+  - update
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  annotations:
+    kubernetes.io/deprecation: cloud-provider role is DEPRECATED in the concern of
+      potential collisions and will be removed in 1.16. Do not use this role.
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: gcp-cloud-controller.addons.k8s.io
+    addonmanager.kubernetes.io/mode: Reconcile
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: gcp-cloud-controller.addons.k8s.io
+  name: cloud-provider
+  namespace: kube-system
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+  - get
+  - patch
+  - update
+  - list
+  - watch
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  annotations:
+    kubernetes.io/deprecation: cloud-provider clusterrole is DEPRECATED in the concern
+      of potential collisions and will be removed in 1.16. Do not use this role.
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: gcp-cloud-controller.addons.k8s.io
+    addonmanager.kubernetes.io/mode: Reconcile
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: gcp-cloud-controller.addons.k8s.io
+  name: cloud-provider
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: gcp-cloud-controller.addons.k8s.io
+    addonmanager.kubernetes.io/mode: Reconcile
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: gcp-cloud-controller.addons.k8s.io
+  name: gce:cloud-provider
+  namespace: kube-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: gce:cloud-provider
+subjects:
+- kind: ServiceAccount
+  name: cloud-provider
+  namespace: kube-system
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: gcp-cloud-controller.addons.k8s.io
+    addonmanager.kubernetes.io/mode: Reconcile
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: gcp-cloud-controller.addons.k8s.io
+  name: gce:cloud-provider
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: gce:cloud-provider
+subjects:
+- kind: ServiceAccount
+  name: cloud-provider
+  namespace: kube-system
diff --git a/...egration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/...egration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
@@ -23,8 +23,8 @@ spec:
     clusterCIDR: 100.96.0.0/11
     clusterName: minimal-example-com
     controllers:
-    - '*,-gkenetworkparamset'
-    image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v26.2.4
+    - '*'
+    image: gcr.io/k8s-staging-cloud-provider-gcp/cloud-controller-manager:master
     leaderElection:
       leaderElect: true
   cloudProvider: gce

diff --git a/...e_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...e_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -133,7 +133,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.23
     manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml
-    manifestHash: 9e80ca766c56a45af5a93a49a067740cf9d35716b95d300ac6f4aa08384f3544
+    manifestHash: 3c55d971edba1793b82df1a202b0f429a778f2f4f8294c010d7a4fb7aca70c8b
     name: gcp-cloud-controller.addons.k8s.io
     prune:
       kinds: