Merge pull request #13 from DoodleScheduling/DK-2193

added reference reconcile fix DK-2193

Author: raffis

config/crd/bases/dbprovisioning.infra.doodle.com_mongodbdatabases.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: mongodbdatabases.dbprovisioning.infra.doodle.com
 spec:

config/crd/bases/dbprovisioning.infra.doodle.com_mongodbusers.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: mongodbusers.dbprovisioning.infra.doodle.com
 spec:
@@ -75,6 +75,17 @@ spec:
                 required:
                 - name
                 type: object
+              roles:
+                default:
+                - name: readWrite
+                items:
+                  properties:
+                    name:
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
             required:
             - credentials
             - database

config/crd/bases/dbprovisioning.infra.doodle.com_postgresqldatabases.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: postgresqldatabases.dbprovisioning.infra.doodle.com
 spec:

config/crd/bases/dbprovisioning.infra.doodle.com_postgresqlusers.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: postgresqlusers.dbprovisioning.infra.doodle.com
 spec:

controllers/mongodbuser_controller.go

@@ -51,7 +51,7 @@ func (r *MongoDBUserReconciler) SetupWithManager(mgr ctrl.Manager, maxConcurrent
 		func(o client.Object) []string {
 			usr := o.(*infrav1beta1.MongoDBUser)
 			return []string{
-				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Credentials),
+				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Credentials.Name),
 			}
 		},
 	); err != nil {
@@ -63,7 +63,7 @@ func (r *MongoDBUserReconciler) SetupWithManager(mgr ctrl.Manager, maxConcurrent
 		func(o client.Object) []string {
 			usr := o.(*infrav1beta1.MongoDBUser)
 			return []string{
-				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Database),
+				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Database.Name),
 			}
 		},
 	); err != nil {
@@ -93,14 +93,14 @@ func (r *MongoDBUserReconciler) requestsForSecretChange(o client.Object) []recon
 	ctx := context.Background()
 	var list infrav1beta1.MongoDBUserList
 	if err := r.List(ctx, &list, client.MatchingFields{
-		secretIndexKey: objectKey(s).String(),
+		credentialsIndexKey: objectKey(s).String(),
 	}); err != nil {
 		return nil
 	}
 
 	var reqs []reconcile.Request
 	for _, i := range list.Items {
-		r.Log.Info("referenced secret from a mongodbuser change detected, reconcile binding", "namespace", i.GetNamespace(), "name", i.GetName())
+		r.Log.Info("referenced secret from a mongodbuser change detected, reconcile", "namespace", i.GetNamespace(), "name", i.GetName())
 		reqs = append(reqs, reconcile.Request{NamespacedName: objectKey(&i)})
 	}
 
@@ -123,7 +123,7 @@ func (r *MongoDBUserReconciler) requestsForDatabaseChange(o client.Object) []rec
 
 	var reqs []reconcile.Request
 	for _, i := range list.Items {
-		r.Log.Info("referenced database from a mongodbuser change detected, reconcile binding", "namespace", i.GetNamespace(), "name", i.GetName())
+		r.Log.Info("referenced database from a mongodbuser change detected, reconcile", "namespace", i.GetNamespace(), "name", i.GetName())
 		reqs = append(reqs, reconcile.Request{NamespacedName: objectKey(&i)})
 	}
 

controllers/postgresqluser_controller.go

@@ -51,7 +51,7 @@ func (r *PostgreSQLUserReconciler) SetupWithManager(mgr ctrl.Manager, maxConcurr
 		func(o client.Object) []string {
 			usr := o.(*infrav1beta1.PostgreSQLUser)
 			return []string{
-				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Credentials),
+				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Credentials.Name),
 			}
 		},
 	); err != nil {
@@ -63,7 +63,7 @@ func (r *PostgreSQLUserReconciler) SetupWithManager(mgr ctrl.Manager, maxConcurr
 		func(o client.Object) []string {
 			usr := o.(*infrav1beta1.PostgreSQLUser)
 			return []string{
-				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Database),
+				fmt.Sprintf("%s/%s", usr.GetNamespace(), usr.Spec.Database.Name),
 			}
 		},
 	); err != nil {
@@ -93,14 +93,14 @@ func (r *PostgreSQLUserReconciler) requestsForSecretChange(o client.Object) []re
 	ctx := context.Background()
 	var list infrav1beta1.PostgreSQLUserList
 	if err := r.List(ctx, &list, client.MatchingFields{
-		secretIndexKey: objectKey(s).String(),
+		credentialsIndexKey: objectKey(s).String(),
 	}); err != nil {
 		return nil
 	}
 
 	var reqs []reconcile.Request
 	for _, i := range list.Items {
-		r.Log.Info("referenced secret from a postgresqluser change detected, reconcile binding", "namespace", i.GetNamespace(), "name", i.GetName())
+		r.Log.Info("referenced secret from a postgresqluser change detected, reconcile", "namespace", i.GetNamespace(), "name", i.GetName())
 		reqs = append(reqs, reconcile.Request{NamespacedName: objectKey(&i)})
 	}
 
@@ -123,7 +123,7 @@ func (r *PostgreSQLUserReconciler) requestsForDatabaseChange(o client.Object) []
 
 	var reqs []reconcile.Request
 	for _, i := range list.Items {
-		r.Log.Info("referenced database from a postgresqluser change detected, reconcile binding", "namespace", i.GetNamespace(), "name", i.GetName())
+		r.Log.Info("referenced database from a postgresqluser change detected, reconcile", "namespace", i.GetNamespace(), "name", i.GetName())
 		reqs = append(reqs, reconcile.Request{NamespacedName: objectKey(&i)})
 	}
 

go.mod

@@ -13,13 +13,11 @@ require (
 	github.com/spf13/viper v1.7.0
 	github.com/xdg/stringprep v1.0.0 // indirect
 	go.mongodb.org/mongo-driver v1.4.4
+	golang.org/x/mod v0.4.0 // indirect
 	golang.org/x/tools v0.1.0 // indirect
 	k8s.io/api v0.20.2
 	k8s.io/apiextensions-apiserver v0.20.2 // indirect
 	k8s.io/apimachinery v0.20.2
 	k8s.io/client-go v0.20.2
-	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
-	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
-	mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect
 	sigs.k8s.io/controller-runtime v0.8.0
 )