feat: Remove support for postgresql user

BREAKING CHANGE: Do not support anymore postgresql user. Switch to postgresqluserrole is now mandatory
EasyMile · Mar 2, 2024 · 6438093 · 6438093
1 parent c8c9a02
commit 6438093
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 2,095 deletions.
diff --git a/PROJECT b/PROJECT
@@ -26,15 +26,6 @@ resources:
     kind: PostgresqlDatabase
     path: github.com/easymile/postgresql-operator/apis/postgresql/v1alpha1
     version: v1alpha1
-  - api:
-      crdVersion: v1
-      namespaced: true
-    controller: true
-    domain: easymile.com
-    group: postgresql
-    kind: PostgresqlUser
-    path: github.com/easymile/postgresql-operator/apis/postgresql/v1alpha1
-    version: v1alpha1
   - api:
       crdVersion: v1
       namespaced: true

diff --git a/README.md b/README.md
@@ -31,7 +31,6 @@ Moreover, a single User can only have rights to one Database.
 | --------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
 | [PostgresqlEngineConfiguration](docs/crds/PostgresqlEngineConfiguration.md) | Represents a PostgreSQL Engine Configuration with all necessary data to connect it |
 | [PostgresqlDatabase](docs/crds/PostgresqlDatabase.md)                       | Represents a PostgreSQL Database                                                   |
-| DEPRECATED [PostgresqlUser](docs/crds/PostgresqlUser.md)                    | Represents a PostgreSQL User                                                       |
 | [PostgresqlUserRole](docs/crds/PostgresqlUserRole.md)                       | Represents a PostgreSQL User Role                                                  |
 
 ## How to deploy ?

diff --git a/api/postgresql/v1alpha1/postgresqluser_types.go b/api/postgresql/v1alpha1/postgresqluser_types.go
diff --git a/api/postgresql/v1alpha1/postgresqluserrole_types.go b/api/postgresql/v1alpha1/postgresqluserrole_types.go
@@ -24,6 +24,12 @@ import (
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
+type PrivilegesSpecEnum string
+
+const OwnerPrivilege PrivilegesSpecEnum = "OWNER"
+const ReaderPrivilege PrivilegesSpecEnum = "READER"
+const WriterPrivilege PrivilegesSpecEnum = "WRITER"
+
 type ConnectionTypesSpecEnum string
 
 const PrimaryConnectionType ConnectionTypesSpecEnum = "PRIMARY"

diff --git a/api/postgresql/v1alpha1/zz_generated.deepcopy.go b/api/postgresql/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/main.go b/cmd/main.go
@@ -139,23 +139,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&postgresqlcontrollers.PostgresqlUserReconciler{
-		Client:   mgr.GetClient(),
-		Scheme:   mgr.GetScheme(),
-		Recorder: mgr.GetEventRecorderFor("postgresqluser-controller"),
-		Log: ctrl.Log.WithValues(
-			"controller",
-			"postgresqluser",
-			"controllerKind",
-			"PostgresqlUser",
-			"controllerGroup",
-			"postgresql.easymile.com",
-		),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "PostgresqlUser")
-		os.Exit(1)
-	}
-
 	if err = (&postgresqlcontrollers.PostgresqlUserRoleReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -101,29 +101,3 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - postgresql.easymile.com
-  resources:
-  - postgresqlusers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - postgresql.easymile.com
-  resources:
-  - postgresqlusers/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - postgresql.easymile.com
-  resources:
-  - postgresqlusers/status
-  verbs:
-  - get
-  - patch
-  - update
diff --git a/config/samples/postgresql_v1alpha1_postgresqluser.yaml b/config/samples/postgresql_v1alpha1_postgresqluser.yaml
diff --git a/config/samples/user/full.yaml b/config/samples/user/full.yaml
diff --git a/config/samples/user/simple.yaml b/config/samples/user/simple.yaml