Skip to content

Commit 82168e0

Browse files
committed
do not create public
1 parent 00243d3 commit 82168e0

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

Diff for: pkg/controller/postgres/postgres_controller.go

+8-12
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,13 @@ func (r *ReconcilePostgres) Reconcile(request reconcile.Request) (_ reconcile.Re
212212
continue
213213
}
214214

215-
// Create schema
216-
err = r.pg.CreateSchema(database, owner, schema, reqLogger)
217-
if err != nil {
218-
reqLogger.Error(err, fmt.Sprintf("Could not create schema %s", schema))
219-
continue
215+
if schema != "public" {
216+
// Create schema
217+
err = r.pg.CreateSchema(database, owner, schema, reqLogger)
218+
if err != nil {
219+
reqLogger.Error(err, fmt.Sprintf("Could not create schema %s", schema))
220+
continue
221+
}
220222
}
221223

222224
// Set privileges on schema
@@ -238,13 +240,7 @@ func (r *ReconcilePostgres) Reconcile(request reconcile.Request) (_ reconcile.Re
238240
reqLogger.Error(err, fmt.Sprintf("Could not give %s permissions for sequnces \"%s\"", writer, "USAGE"))
239241
continue
240242
}
241-
// ownerCreateSchema := true
242-
reqLogger.Info(fmt.Sprintf("schema is %s", schema))
243-
if schema == "public" {
244-
reqLogger.Info("schema is public, skipping creation")
245-
// ownerCreateSchema = false
246-
}
247-
schemaPrivilegesOwner := postgres.PostgresSchemaPrivileges{database, owner, schema, readerPrivs, false}
243+
schemaPrivilegesOwner := postgres.PostgresSchemaPrivileges{database, owner, schema, readerPrivs, true}
248244
err = r.pg.SetSchemaPrivileges(schemaPrivilegesOwner, reqLogger)
249245
if err != nil {
250246
reqLogger.Error(err, fmt.Sprintf("Could not give %s permissions \"%s\"", writer, writerPrivs))

0 commit comments

Comments
 (0)