Don't set owner reference on the cluster secret, fixes #175

bitpoke · Dec 5, 2018 · 2bed433 · 2bed433
1 parent d99295c
commit 2bed433
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/pkg/controller/mysqlcluster/internal/syncer/secret.go b/pkg/controller/mysqlcluster/internal/syncer/secret.go
@@ -44,7 +44,7 @@ func NewSecretSyncer(c client.Client, scheme *runtime.Scheme, cluster *mysqlclus
 		},
 	}
 
-	return syncer.NewObjectSyncer("Secret", cluster.Unwrap(), obj, c, scheme, func(in runtime.Object) error {
+	return syncer.NewObjectSyncer("Secret", nil, obj, c, scheme, func(in runtime.Object) error {
 		out := in.(*core.Secret)
 
 		if _, ok := out.Data["ROOT_PASSWORD"]; !ok {

diff --git a/pkg/controller/mysqlcluster/mysqlcluster_controller_test.go b/pkg/controller/mysqlcluster/mysqlcluster_controller_test.go
@@ -340,6 +340,24 @@ var _ = Describe("MysqlCluster controller", func() {
 				Expect(pod1).To(haveLabelWithValue("role", "master"))
 				Expect(pod1).To(haveLabelWithValue("healthy", "yes"))
 			})
+			It("should update cluster secret with keys", func() {
+				s := &corev1.Secret{}
+				sKey := types.NamespacedName{
+					Name:      secret.Name,
+					Namespace: secret.Namespace,
+				}
+				Expect(c.Get(context.TODO(), sKey, s)).To(Succeed())
+
+				Expect(s.OwnerReferences).To(HaveLen(0), "should have no owner reference set")
+
+				// check for keys to be set
+				Expect(s.Data).To(HaveKey("REPLICATION_USER"))
+				Expect(s.Data).To(HaveKey("REPLICATION_PASSWORD"))
+				Expect(s.Data).To(HaveKey("METRICS_EXPORTER_USER"))
+				Expect(s.Data).To(HaveKey("METRICS_EXPORTER_PASSWORD"))
+				Expect(s.Data).To(HaveKey("ORC_TOPOLOGY_USER"))
+				Expect(s.Data).To(HaveKey("ORC_TOPOLOGY_PASSWORD"))
+			})
 		})
 	})
 })