Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump GCP CCM again #15972

Merged
merged 1 commit into from
Oct 7, 2023
+1,547 −72
Merged

Bump GCP CCM again #15972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/model/components/gcpcloudcontrollermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

controllers got renamed recently

 mahamed  REDACTED  ~  $  docker run gcr.io/k8s-staging-cloud-provider-gcp/cloud-controller-manager:master --help | grep controllers
      --controllers strings                       A list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller named 'foo', '-foo' disables the controller named 'foo'.
                                                  All controllers: cloud-node-controller, cloud-node-lifecycle-controller, gkenetworkparamset, node-ipam-controller, node-route-controller, service-lb-controller
                                                  Disabled-by-default controllers: gkenetworkparamset (default [*

}

ccmConfig.Controllers = changes
Expand All @@ -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"
}
}

Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/kubetest2-kops/deployer/dumplogs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ func (d *deployer) dumpClusterInfo() error {
"persistentvolumeclaims",
"poddisruptionbudgets",
"serviceaccounts",
"rolebindings",
"roles",
}
for _, namespace := range namespaces {
namespace = strings.TrimSpace(namespace)
Expand Down
11 changes: 6 additions & 5 deletions tests/e2e/kubetest2-kops/deployer/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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])
Expand All @@ -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())
}
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
158 changes: 154 additions & 4 deletions ...s_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions ...egration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...e_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Loading