remove ownerrefs from usersettings

Author: stlaz

pkg/usersettings/helpers.go

@@ -5,38 +5,23 @@ import (
 	core "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func newUserSettingMeta(userInfo authenticationv1.UserInfo) (*UserSettingMeta, error) {
 	uid := userInfo.UID
 	name := userInfo.Username
-	resourceIdentifier := ""
-	var ownerReferences []meta.OwnerReference
+	resourceIdentifier := name
 
 	if uid != "" {
 		resourceIdentifier = string(uid)
-		ownerReferences = []meta.OwnerReference{
-			{
-				APIVersion: "user.openshift.io/v1", // TODO: is this necessary? What does it do?
-				Kind:       "User",                 // TODO: is this necessary? What does it do?
-				Name:       name,
-				UID:        types.UID(uid),
-			},
-		}
 	} else if name == "kube:admin" {
 		resourceIdentifier = "kubeadmin"
-		ownerReferences = []meta.OwnerReference{}
-	} //else {
-	// FIXME: The legacy OIDC config won't pass UIDs, which is a k8s design flaw. We may need to parse the token to get its sub claim.
-	//return nil, errors.New("User must have UID to get required resource data for user-settings")
-	//}
+	}
 
 	return &UserSettingMeta{
 		Username:           name,
 		UID:                string(uid),
 		ResourceIdentifier: resourceIdentifier,
-		OwnerReferences:    ownerReferences,
 	}, nil
 }
 
@@ -47,8 +32,7 @@ func createRole(userSettingMeta *UserSettingMeta) *rbac.Role {
 			Kind:       "Role",
 		},
 		ObjectMeta: meta.ObjectMeta{
-			Name:            userSettingMeta.getRoleName(),
-			OwnerReferences: userSettingMeta.OwnerReferences,
+			Name: userSettingMeta.getRoleName(),
 		},
 		Rules: []rbac.PolicyRule{
 			{
@@ -80,8 +64,7 @@ func createRoleBinding(userSettingMeta *UserSettingMeta) *rbac.RoleBinding {
 			Kind:       "RoleBinding",
 		},
 		ObjectMeta: meta.ObjectMeta{
-			Name:            userSettingMeta.getRoleBindingName(),
-			OwnerReferences: userSettingMeta.OwnerReferences,
+			Name: userSettingMeta.getRoleBindingName(),
 		},
 		Subjects: []rbac.Subject{
 			{
@@ -105,8 +88,7 @@ func createConfigMap(userSettingMeta *UserSettingMeta) *core.ConfigMap {
 			Kind:       "ConfigMap",
 		},
 		ObjectMeta: meta.ObjectMeta{
-			Name:            userSettingMeta.getConfigMapName(),
-			OwnerReferences: userSettingMeta.OwnerReferences,
+			Name: userSettingMeta.getConfigMapName(),
 		},
 	}
 }

pkg/usersettings/helpers_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
-	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestNewUserSettingsMeta(t *testing.T) {
@@ -26,7 +25,6 @@ func TestNewUserSettingsMeta(t *testing.T) {
 				Username:           "kube:admin",
 				UID:                "",
 				ResourceIdentifier: "kubeadmin",
-				OwnerReferences:    []meta.OwnerReference{},
 			},
 		},
 		{
@@ -40,14 +38,6 @@ func TestNewUserSettingsMeta(t *testing.T) {
 				Username:           "kube:admin",
 				UID:                "1234",
 				ResourceIdentifier: "1234",
-				OwnerReferences: []meta.OwnerReference{
-					{
-						APIVersion: "user.openshift.io/v1",
-						Kind:       "User",
-						Name:       "kube:admin",
-						UID:        "1234",
-					},
-				},
 			},
 		},
 		{
@@ -61,26 +51,8 @@ func TestNewUserSettingsMeta(t *testing.T) {
 				Username:           "developer",
 				UID:                "1234",
 				ResourceIdentifier: "1234",
-				OwnerReferences: []meta.OwnerReference{
-					{
-						APIVersion: "user.openshift.io/v1",
-						Kind:       "User",
-						Name:       "developer",
-						UID:        "1234",
-					},
-				},
 			},
 		},
-		// FIXME: the following test will currently fail as the else clause is commented out
-		// {
-		// 	testcase: "returns error for non kube:admin users without uid",
-		// 	userInfo: authenticationv1.UserInfo{
-		// 		Username: "developer",
-		// 		UID:      "",
-		// 	},
-		// 	expectedError: errors.New("User must have UID to get required resource data for user-settings"),
-		// 	expectedData:  nil,
-		// },
 	}
 
 	for _, tt := range tests {

pkg/usersettings/types.go

@@ -1,15 +1,10 @@
 package usersettings
 
-import (
-	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
 type UserSettingMeta struct {
 	Username string
 	UID      string
 	// The resource identifier contains "kubeadmin" for the kubeadmin and the user uid otherwise.
 	ResourceIdentifier string
-	OwnerReferences    []meta.OwnerReference
 }
 
 func (r *UserSettingMeta) getConfigMapName() string {