diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go index b4d7fd82f1388f1ca477130ba5b0c541c8a9f2c6..b436595ef866f35ea395837e30859a9ff6571fff 100644 --- 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 index 301803c354bf6a79af8934386c00095905e4ce6e..d6c416d5681369a32ae30f0557065465ad54a619 100755 --- 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" }