Set ibm-namespace-scope-operator sa as default (#33)

Xin Li · web-flow · commit 76c0fdc2bc1e · 2020-11-09T14:25:23.000+08:00
diff --git a/controllers/namespacescope_controller.go b/controllers/namespacescope_controller.go
@@ -304,14 +304,14 @@ func (r *NamespaceScopeReconciler) GetServiceAccountFromNamespace(labels map[str
 		return nil, err
 	}
 
-	var saNames []string
+	// By default, set ibm-namespace-scope-operator service account
+	var saNames = []string{"ibm-namespace-scope-operator"}
 
 	for _, pod := range pods.Items {
 		if len(pod.Spec.ServiceAccountName) != 0 {
 			saNames = append(saNames, pod.Spec.ServiceAccountName)
 		}
 	}
-
 	saNames = util.ToStringSlice(util.MakeSet(saNames))
 
 	return saNames, nil

Original file line number	Diff line number	Diff line change
`@@ -304,14 +304,14 @@ func (r *NamespaceScopeReconciler) GetServiceAccountFromNamespace(labels map[str`
`304`	`304`	`return nil, err`
`305`	`305`	`}`
`306`	`306`
`307`		`- var saNames []string`
	`307`	`+ // By default, set ibm-namespace-scope-operator service account`
	`308`	`+ var saNames = []string{"ibm-namespace-scope-operator"}`
`308`	`309`
`309`	`310`	`for _, pod := range pods.Items {`
`310`	`311`	`if len(pod.Spec.ServiceAccountName) != 0 {`
`311`	`312`	`saNames = append(saNames, pod.Spec.ServiceAccountName)`
`312`	`313`	`}`
`313`	`314`	`}`
`314`		`-`
`315`	`315`	`saNames = util.ToStringSlice(util.MakeSet(saNames))`
`316`	`316`
`317`	`317`	`return saNames, nil`