Fix syntax error and run_locally_script

zalando · Dec 21, 2018 · a3cf80e · a3cf80e
1 parent 973b356
commit a3cf80e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go
@@ -116,7 +116,7 @@ func (strategy DefaultUserSyncStrategy) createPgUser(user spec.PgUser, db *sql.D
 		userFlags = append(userFlags, fmt.Sprintf(inRoleTemplate, quoteMemberList(user)))
 	}
 	if user.AdminRole != "" {
-		userFlags = append(userFlags, fmt.Sprintf(adminTemplate, user))
+		userFlags = append(userFlags, fmt.Sprintf(adminTemplate, user.AdminRole))
 	}
 
 	if user.Password == "" {

diff --git a/run_operator_locally.sh b/run_operator_locally.sh
@@ -121,7 +121,7 @@ function deploy_self_built_image() {
     # update the tag in the postgres operator conf
     # since the image with this tag already exists on the machine,
     # docker should not attempt to fetch it from the registry due to imagePullPolicy
-    sed --expression "s/\(image\:.*\:\).*$/\1$TAG/" manifests/postgres-operator.yaml > "$PATH_TO_LOCAL_OPERATOR_MANIFEST"
+    sed --expression "s/\(image\:.*\:\).*$/\1$TAG/; s/smoke-tested-//" manifests/postgres-operator.yaml > "$PATH_TO_LOCAL_OPERATOR_MANIFEST"
 
     retry "kubectl create -f \"$PATH_TO_LOCAL_OPERATOR_MANIFEST\"" "attempt to create $PATH_TO_LOCAL_OPERATOR_MANIFEST resource"
 }