Functions, not variables

kubernetes-retired · Jul 15, 2019 · 550cd63 · 550cd63
1 parent 0a418a5
commit 550cd63
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 83 deletions.
diff --git a/objects/all.go b/objects/all.go
@@ -3,12 +3,15 @@ package objects
 import "k8s.io/apimachinery/pkg/runtime"
 
 func GetAll(capdImage string) []runtime.Object {
+	namespaceObj := GetNamespace()
 	statefulSet := GetStatefulSet(capdImage)
+	clusterRole := GetClusterRole()
+	clusterRoleBinding := GetClusterRoleBinding()
 
 	return []runtime.Object{
-		&Namespace,
+		&namespaceObj,
 		&statefulSet,
-		&ClusterRole,
-		&ClusterRoleBinding,
+		&clusterRole,
+		&clusterRoleBinding,
 	}
 }
diff --git a/objects/control_plane.go b/objects/control_plane.go
@@ -10,11 +10,13 @@ import (
 
 const namespace = "docker-provider-system"
 
-var Namespace = core.Namespace{
-	ObjectMeta: meta.ObjectMeta{
-		Labels: map[string]string{"controller-tools.k8s.io": "1.0"},
-		Name:   namespace,
-	},
+func GetNamespace() core.Namespace {
+	return core.Namespace{
+		ObjectMeta: meta.ObjectMeta{
+			Labels: map[string]string{"controller-tools.k8s.io": "1.0"},
+			Name:   namespace,
+		},
+	}
 }
 
 var (

diff --git a/objects/rbac.go b/objects/rbac.go
@@ -7,86 +7,92 @@ import (
 	capi "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 )
 
-var ClusterRole = rbac.ClusterRole{
-	ObjectMeta: meta.ObjectMeta{
-		Name: "docker-provider-manager-role",
-	},
-	Rules: []rbac.PolicyRule{
-		{
-			APIGroups: []string{
-				capi.SchemeGroupVersion.Group,
-			},
-			Resources: []string{
-				"clusters",
-				"clusters/status",
-			},
-			Verbs: []string{
-				"get",
-				"list",
-				"watch",
-				"create",
-				"update",
-				"patch",
-				"delete",
-			},
-		},
-		{
-			APIGroups: []string{
-				capi.SchemeGroupVersion.Group,
-			},
-			Resources: []string{
-				"machines",
-				"machines/status",
-				"machinedeployments",
-				"machinedeployments/status",
-				"machinesets",
-				"machinesets/status",
-				"machineclasses",
-			},
-			Verbs: []string{
-				"get",
-				"list",
-				"watch",
-				"create",
-				"update",
-				"patch",
-				"delete",
-			},
+const clusterRoleName = "docker-provider-manager-role"
+
+func GetClusterRole() rbac.ClusterRole {
+	return rbac.ClusterRole{
+		ObjectMeta: meta.ObjectMeta{
+			Name: clusterRoleName,
 		},
-		{
-			APIGroups: []string{
-				core.GroupName,
+		Rules: []rbac.PolicyRule{
+			{
+				APIGroups: []string{
+					capi.SchemeGroupVersion.Group,
+				},
+				Resources: []string{
+					"clusters",
+					"clusters/status",
+				},
+				Verbs: []string{
+					"get",
+					"list",
+					"watch",
+					"create",
+					"update",
+					"patch",
+					"delete",
+				},
 			},
-			Resources: []string{
-				"nodes",
-				"events",
-				"secrets",
+			{
+				APIGroups: []string{
+					capi.SchemeGroupVersion.Group,
+				},
+				Resources: []string{
+					"machines",
+					"machines/status",
+					"machinedeployments",
+					"machinedeployments/status",
+					"machinesets",
+					"machinesets/status",
+					"machineclasses",
+				},
+				Verbs: []string{
+					"get",
+					"list",
+					"watch",
+					"create",
+					"update",
+					"patch",
+					"delete",
+				},
 			},
-			Verbs: []string{
-				"get",
-				"list",
-				"watch",
-				"create",
-				"update",
-				"patch",
-				"delete",
+			{
+				APIGroups: []string{
+					core.GroupName,
+				},
+				Resources: []string{
+					"nodes",
+					"events",
+					"secrets",
+				},
+				Verbs: []string{
+					"get",
+					"list",
+					"watch",
+					"create",
+					"update",
+					"patch",
+					"delete",
+				},
 			},
 		},
-	},
+	}
 }
 
-var ClusterRoleBinding = rbac.ClusterRoleBinding{
-	ObjectMeta: meta.ObjectMeta{
-		Name: "docker-provider-manager-rolebinding",
-	},
-	RoleRef: rbac.RoleRef{
-		Kind:     "ClusterRole",
-		Name:     ClusterRole.ObjectMeta.Name,
-		APIGroup: rbac.GroupName,
-	},
-	Subjects: []rbac.Subject{{
-		Kind:      rbac.ServiceAccountKind,
-		Name:      "default",
-		Namespace: namespace,
-	}},
+func GetClusterRoleBinding() rbac.ClusterRoleBinding {
+	return rbac.ClusterRoleBinding{
+		ObjectMeta: meta.ObjectMeta{
+			Name: "docker-provider-manager-rolebinding",
+		},
+		RoleRef: rbac.RoleRef{
+			Kind:     "ClusterRole",
+			Name:     clusterRoleName,
+			APIGroup: rbac.GroupName,
+		},
+		Subjects: []rbac.Subject{{
+			Kind:      rbac.ServiceAccountKind,
+			Name:      "default",
+			Namespace: namespace,
+		}},
+	}
 }