Skip to content

Commit 683aec9

Browse files
committed
fix unit tests
1 parent 3b9a28f commit 683aec9

1 file changed

Lines changed: 24 additions & 15 deletions

File tree

internal/controller/postgrescluster/pki_test.go

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,29 @@ func TestReconcileCerts(t *testing.T) {
9393
}
9494
cluster2CASecret.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Secret"))
9595

96-
t.Run("check root CA secret first owner reference", func(t *testing.T) {
96+
t.Run("check root CA secret for cluster1", func(t *testing.T) {
9797
err := tClient.Get(ctx, client.ObjectKeyFromObject(cluster1CASecret), cluster1CASecret)
9898
assert.NilError(t, err)
9999

100100
assert.Check(t, len(cluster1CASecret.ObjectMeta.OwnerReferences) == 1, "first owner reference not set")
101101

102102
expectedOR := metav1.OwnerReference{
103-
APIVersion: "upstream.pgv2.percona.com/v1beta1",
104-
Kind: "PostgresCluster",
105-
Name: "hippocluster1",
106-
UID: cluster1.UID,
103+
APIVersion: "upstream.pgv2.percona.com/v1beta1",
104+
Kind: "PostgresCluster",
105+
Name: "hippocluster1",
106+
UID: cluster1.UID,
107+
Controller: new(true),
108+
BlockOwnerDeletion: new(true),
107109
}
108110

109-
// K8SPG-553
110-
if len(cluster1CASecret.ObjectMeta.OwnerReferences) > 0 {
111-
assert.Equal(t, cluster1CASecret.ObjectMeta.OwnerReferences[0], expectedOR)
112-
}
111+
assert.Equal(t, cluster1CASecret.ObjectMeta.OwnerReferences[0].APIVersion, expectedOR.APIVersion)
112+
assert.Equal(t, cluster1CASecret.ObjectMeta.OwnerReferences[0].Kind, expectedOR.Kind)
113+
assert.Equal(t, cluster1CASecret.ObjectMeta.OwnerReferences[0].Name, expectedOR.Name)
114+
assert.Equal(t, *cluster1CASecret.ObjectMeta.OwnerReferences[0].Controller, true)
115+
assert.Equal(t, *cluster1CASecret.ObjectMeta.OwnerReferences[0].BlockOwnerDeletion, true)
113116
})
114117

115-
t.Run("check root CA secret second owner reference", func(t *testing.T) {
118+
t.Run("check root CA secret for cluster2", func(t *testing.T) {
116119
_, err := r.reconcileRootCertificate(ctx, cluster2)
117120
assert.NilError(t, err)
118121

@@ -125,13 +128,19 @@ func TestReconcileCerts(t *testing.T) {
125128
assert.Check(t, len(cluster2CASecret.ObjectMeta.OwnerReferences) == 1, "should be single owner reference")
126129

127130
expectedOR := metav1.OwnerReference{
128-
APIVersion: "upstream.pgv2.percona.com/v1beta1",
129-
Kind: "PostgresCluster",
130-
Name: "hippocluster2",
131-
UID: cluster2.UID,
131+
APIVersion: "upstream.pgv2.percona.com/v1beta1",
132+
Kind: "PostgresCluster",
133+
Name: "hippocluster2",
134+
UID: cluster2.UID,
135+
Controller: new(true),
136+
BlockOwnerDeletion: new(true),
132137
}
133138

134-
assert.Equal(t, cluster2CASecret.ObjectMeta.OwnerReferences[0], expectedOR)
139+
assert.Equal(t, cluster2CASecret.ObjectMeta.OwnerReferences[0].APIVersion, expectedOR.APIVersion)
140+
assert.Equal(t, cluster2CASecret.ObjectMeta.OwnerReferences[0].Kind, expectedOR.Kind)
141+
assert.Equal(t, cluster2CASecret.ObjectMeta.OwnerReferences[0].Name, expectedOR.Name)
142+
assert.Equal(t, *cluster2CASecret.ObjectMeta.OwnerReferences[0].Controller, true)
143+
assert.Equal(t, *cluster2CASecret.ObjectMeta.OwnerReferences[0].BlockOwnerDeletion, true)
135144
})
136145

137146
t.Run("root certificate is returned correctly", func(t *testing.T) {

0 commit comments

Comments
 (0)