Skip to content

Commit

Permalink
Removes legacy cloud-provider resources
Browse files Browse the repository at this point in the history
This change removes the cloud-provider ClusterRole, ClusterRoleBinding
and ServiceAccount that are no longer required from 4.16
  • Loading branch information
theobarberbany committed Dec 14, 2023
1 parent c4ad7c9 commit 215a803
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions pkg/operator/starter.go
Expand Up @@ -165,6 +165,22 @@ func RunOperator(ctx context.Context, cc *controllercmd.ControllerContext) error
return isVSphere
},
nil,
).WithConditionalResources(
bindata.Asset,
[]string{
"assets/kube-controller-manager/gce/cloud-provider-role.yaml",
"assets/kube-controller-manager/gce/cloud-provider-binding.yaml",
"assets/kube-controller-manager/sa.yaml",
},
func() bool {
// We do not want to apply these resources, so must return false here
return false
},
func() bool {
// The resources above are required for the 4.14 -> 4.15 upgrade path.
// They are not required from 4.16, so can re removed.
return true
},
).AddKubeInformers(kubeInformersForNamespaces)

targetConfigController := targetconfigcontroller.NewTargetConfigController(
Expand Down

0 comments on commit 215a803

Please sign in to comment.