github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Federation] Uniquify the ClusterRole and ClusterRoleBinding names created by .

pull/6/head
Jonathan MacMillan 2017-05-24 12:04:16 -07:00
parent 6f7eac63c2
commit 748ea1109d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/pkg/kubefed/join.go
View File

@ -593,7 +593,7 @@ func createServiceAccount(clusterClientset internalclientset.Interface, namespac
// service account identified by saName to access all resources in all namespaces // service account identified by saName to access all resources in all namespaces
// in the cluster associated with clusterClientset. // in the cluster associated with clusterClientset.
func createClusterRoleBinding(clusterClientset internalclientset.Interface, saName, namespace, federationName, joiningClusterName string, dryRun bool) (*rbac.ClusterRoleBinding, error) { func createClusterRoleBinding(clusterClientset internalclientset.Interface, saName, namespace, federationName, joiningClusterName string, dryRun bool) (*rbac.ClusterRoleBinding, error) {
roleName := util.ClusterRoleName(saName) roleName := util.ClusterRoleName(federationName, saName)
role := &rbac.ClusterRole{ role := &rbac.ClusterRole{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: roleName, Name: roleName,

4
federation/pkg/kubefed/join_test.go
View File

@ -475,7 +475,7 @@ func fakeJoinTargetClusterFactory(clusterName, clusterCtx, dnsProvider, tmpDirPa
}, },
} }
roleName := util.ClusterRoleName(saName) roleName := util.ClusterRoleName(testFederationName, saName)
clusterRole := rbacv1beta1.ClusterRole{ clusterRole := rbacv1beta1.ClusterRole{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: roleName, Name: roleName,
@ -595,7 +595,7 @@ func fakeCluster(clusterName, secretName, server string, isRBACAPIAvailable bool
saName := serviceAccountName(clusterName) saName := serviceAccountName(clusterName)
annotations := map[string]string{ annotations := map[string]string{
kubectl.ServiceAccountNameAnnotation: saName, kubectl.ServiceAccountNameAnnotation: saName,
kubectl.ClusterRoleNameAnnotation: util.ClusterRoleName(saName), kubectl.ClusterRoleNameAnnotation: util.ClusterRoleName(testFederationName, saName),
} }
cluster.ObjectMeta.SetAnnotations(annotations) cluster.ObjectMeta.SetAnnotations(annotations)
} }

4
federation/pkg/kubefed/unjoin_test.go
View File

@ -275,7 +275,7 @@ func fakeUnjoinHostFactory(clusterName string) cmdutil.Factory {
return &http.Response{StatusCode: http.StatusOK, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &status)}, nil return &http.Response{StatusCode: http.StatusOK, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &status)}, nil
case strings.HasPrefix(p, clusterRoleBindingPrefix) && m == http.MethodDelete: case strings.HasPrefix(p, clusterRoleBindingPrefix) && m == http.MethodDelete:
got := strings.TrimPrefix(p, clusterRoleBindingPrefix) got := strings.TrimPrefix(p, clusterRoleBindingPrefix)
want := util.ClusterRoleName(serviceAccountName(clusterName)) want := util.ClusterRoleName(testFederationName, serviceAccountName(clusterName))
if got != want { if got != want {
return nil, errors.NewNotFound(api.Resource("clusterrolebindings"), got) return nil, errors.NewNotFound(api.Resource("clusterrolebindings"), got)
} }
@ -286,7 +286,7 @@ func fakeUnjoinHostFactory(clusterName string) cmdutil.Factory {
return &http.Response{StatusCode: http.StatusOK, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &status)}, nil return &http.Response{StatusCode: http.StatusOK, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &status)}, nil
case strings.HasPrefix(p, clusterRolePrefix) && m == http.MethodDelete: case strings.HasPrefix(p, clusterRolePrefix) && m == http.MethodDelete:
got := strings.TrimPrefix(p, clusterRolePrefix) got := strings.TrimPrefix(p, clusterRolePrefix)
want := util.ClusterRoleName(serviceAccountName(clusterName)) want := util.ClusterRoleName(testFederationName, serviceAccountName(clusterName))
if got != want { if got != want {
return nil, errors.NewNotFound(api.Resource("clusterroles"), got) return nil, errors.NewNotFound(api.Resource("clusterroles"), got)
} }

4
federation/pkg/kubefed/util/util.go
View File

@ -302,6 +302,6 @@ func ClusterServiceAccountName(joiningClusterName, hostContext string) string {
// ClusterRoleName returns the name of a ClusterRole and its associated // ClusterRoleName returns the name of a ClusterRole and its associated
// ClusterRoleBinding that are used to allow the service account to // ClusterRoleBinding that are used to allow the service account to
// access necessary resources on the cluster. // access necessary resources on the cluster.
func ClusterRoleName(serviceAccountName string) string { func ClusterRoleName(federationName, serviceAccountName string) string {
return fmt.Sprintf("federation-controller-manager:%s", serviceAccountName) return fmt.Sprintf("federation-controller-manager:%s-%s", federationName, serviceAccountName)
} }