public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename the function that checks service account existence

This commit is contained in:
Sergey Dudoladov 2018-02-15 11:14:13 +01:00
parent fab1e34182
commit 155ae8d50f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/controller.go
View File

@ -131,9 +131,9 @@ func (c *Controller) initController() {
c.logger.Infof("config: %s", c.opConfig.MustMarshal()) c.logger.Infof("config: %s", c.opConfig.MustMarshal())
c.mustHaveOperatorServiceAccountInNamespace(c.config.Namespace) c.checkOperatorServiceAccount(c.config.Namespace)
if c.config.Namespace != c.opConfig.WatchedNamespace { if c.config.Namespace != c.opConfig.WatchedNamespace {
c.mustHaveOperatorServiceAccountInNamespace(c.opConfig.WatchedNamespace) c.checkOperatorServiceAccount(c.opConfig.WatchedNamespace)
} }
if c.opConfig.DebugLogging { if c.opConfig.DebugLogging {
@ -262,9 +262,10 @@ func (c *Controller) kubeNodesInformer(stopCh <-chan struct{}, wg *sync.WaitGrou
c.nodesInformer.Run(stopCh) c.nodesInformer.Run(stopCh)
} }
func (c *Controller) mustHaveOperatorServiceAccountInNamespace(namespace string) { // Check that a namespace has the service account that the operator needs
func (c *Controller) checkOperatorServiceAccount(namespace string) {
_, err := c.KubeClient.ServiceAccounts(namespace).Get(c.opConfig.ServiceAccountName, metav1.GetOptions{}) _, err := c.KubeClient.ServiceAccounts(namespace).Get(c.opConfig.ServiceAccountName, metav1.GetOptions{})
if err != nil { if err != nil {
c.logger.Warnf("Cannot find the '%v' service account in the namepsace %q. Pods will not be able to start. Error: %v", c.opConfig.ServiceAccountName, namespace, err) c.logger.Warnf("Cannot find the '%v' service account needed for operator in the namespace %q. Pods will not be able to start. Error: %v", c.opConfig.ServiceAccountName, namespace, err)
} }
} }