Skip to content

Commit

Permalink
Maintain ServiceAccount names for the controllers part of `kube-con…
Browse files Browse the repository at this point in the history
…troller-manager`

$ ./hack/compare-k8s-controllers.sh 1.25 1.26

kube-controller-manager controllers added in 1.26 compared to 1.25:
resource-claim-controller

kube-controller-manager controllers removed in 1.26 compared to 1.25:
  • Loading branch information
ialidzhikov committed Dec 28, 2022
1 parent 806053f commit a8c1dab
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkg/operation/botanist/component/shootsystem/shootsystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@ func (s *shootSystem) getServiceAccountNamesToInvalidate() []string {
)
}

if versionutils.ConstraintK8sGreaterEqual126.Check(s.values.Shoot.KubernetesVersion) {
kubeControllerManagerServiceAccountNames = append(kubeControllerManagerServiceAccountNames,
"resource-claim-controller")
}

return append(kubeControllerManagerServiceAccountNames, "default")
}

Expand Down
13 changes: 13 additions & 0 deletions pkg/operation/botanist/component/shootsystem/shootsystem_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,19 @@ metadata:
}
})
})

Context("k8s >= 1.26", func() {
BeforeEach(func() {
values.Shoot.KubernetesVersion = semver.MustParse("1.26.4")
component = New(c, namespace, values)
})

It("should successfully deploy all resources", func() {
for _, name := range append(defaultKCMControllerSANames, "default", "endpointslicemirroring-controller", "ephemeral-volume-controller", "storage-version-garbage-collector", "service-controller", "route-controller", "node-controller", "resource-claim-controller") {
Expect(string(managedResourceSecret.Data["serviceaccount__kube-system__"+name+".yaml"])).To(Equal(serviceAccountYAMLFor(name)), name)
}
})
})
})

Context("shoot-info ConfigMap", func() {
Expand Down

0 comments on commit a8c1dab

Please sign in to comment.