Some tweaks to ensure compat with newer Go. (#383)

This commit is contained in:
Noah Kantrowitz
2018-09-17 10:13:07 +02:00
committed by zerg-junior
parent f9cbed9be9
commit 688d252752
4 changed files with 12 additions and 17 deletions
+8 -8
View File
@@ -139,10 +139,10 @@ func (c *Controller) initPodServiceAccount() {
if c.opConfig.PodServiceAccountDefinition == "" {
c.opConfig.PodServiceAccountDefinition = `
{ "apiVersion": "v1",
"kind": "ServiceAccount",
"metadata": {
"name": "operator"
{ "apiVersion": "v1",
"kind": "ServiceAccount",
"metadata": {
"name": "operator"
}
}`
}
@@ -175,10 +175,10 @@ func (c *Controller) initRoleBinding() {
// we assume the role is created by the k8s administrator
if c.opConfig.PodServiceAccountRoleBindingDefinition == "" {
c.opConfig.PodServiceAccountRoleBindingDefinition = `
{
{
"apiVersion": "rbac.authorization.k8s.io/v1beta1",
"kind": "RoleBinding",
"metadata": {
"kind": "RoleBinding",
"metadata": {
"name": "zalando-postgres-operator"
},
"roleRef": {
@@ -191,7 +191,7 @@ func (c *Controller) initRoleBinding() {
"kind": "ServiceAccount",
"name": "operator"
}
]
]
}`
}
c.logger.Info("Parse role bindings")
+1 -1
View File
@@ -71,7 +71,7 @@ func (c *Controller) clusterListAndSync() error {
}
c.queueEvents(list, event)
} else {
c.logger.Infof("not enough time passed since the last sync (%s seconds) or repair (%s seconds)",
c.logger.Infof("not enough time passed since the last sync (%v seconds) or repair (%v seconds)",
timeFromPreviousSync, timeFromPreviousRepair)
}
return nil