Skip to content

Commit 706c4e9

Browse files
committed
fix: Adapt test
1 parent 8395ae9 commit 706c4e9

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

pkg/cluster/k8sres.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2371,11 +2371,6 @@ func (c *Cluster) getLogicalBackupJobName() (jobName string) {
23712371
func (c *Cluster) ownerReferences() []metav1.OwnerReference {
23722372
controller := true
23732373

2374-
if c.Statefulset == nil {
2375-
c.logger.Warning("Cannot get owner reference, no statefulset")
2376-
return []metav1.OwnerReference{}
2377-
}
2378-
23792374
return []metav1.OwnerReference{
23802375
{
23812376
UID: c.Postgresql.ObjectMeta.UID,

pkg/cluster/k8sres_test.go

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,9 +1491,9 @@ func TestPodAffinity(t *testing.T) {
14911491
func testDeploymentOwnerReference(cluster *Cluster, deployment *appsv1.Deployment) error {
14921492
owner := deployment.ObjectMeta.OwnerReferences[0]
14931493

1494-
if owner.Name != cluster.Statefulset.ObjectMeta.Name {
1494+
if owner.Name != cluster.Postgresql.ObjectMeta.Name {
14951495
return fmt.Errorf("Ownere reference is incorrect, got %s, expected %s",
1496-
owner.Name, cluster.Statefulset.ObjectMeta.Name)
1496+
owner.Name, cluster.Postgresql.ObjectMeta.Name)
14971497
}
14981498

14991499
return nil
@@ -1502,9 +1502,9 @@ func testDeploymentOwnerReference(cluster *Cluster, deployment *appsv1.Deploymen
15021502
func testServiceOwnerReference(cluster *Cluster, service *v1.Service, role PostgresRole) error {
15031503
owner := service.ObjectMeta.OwnerReferences[0]
15041504

1505-
if owner.Name != cluster.Statefulset.ObjectMeta.Name {
1505+
if owner.Name != cluster.Postgresql.ObjectMeta.Name {
15061506
return fmt.Errorf("Ownere reference is incorrect, got %s, expected %s",
1507-
owner.Name, cluster.Statefulset.ObjectMeta.Name)
1507+
owner.Name, cluster.Postgresql.ObjectMeta.Name)
15081508
}
15091509

15101510
return nil
@@ -2217,9 +2217,10 @@ func TestGeneratePodDisruptionBudget(t *testing.T) {
22172217
eventRecorder),
22182218
policyv1.PodDisruptionBudget{
22192219
ObjectMeta: metav1.ObjectMeta{
2220-
Name: "postgres-myapp-database-pdb",
2221-
Namespace: "myapp",
2222-
Labels: map[string]string{"team": "myapp", "cluster-name": "myapp-database"},
2220+
Name: "postgres-myapp-database-pdb",
2221+
Namespace: "myapp",
2222+
Labels: map[string]string{"team": "myapp", "cluster-name": "myapp-database"},
2223+
OwnerReferences: []metav1.OwnerReference{{Name: "myapp-database"}},
22232224
},
22242225
Spec: policyv1.PodDisruptionBudgetSpec{
22252226
MinAvailable: util.ToIntStr(1),
@@ -2241,9 +2242,10 @@ func TestGeneratePodDisruptionBudget(t *testing.T) {
22412242
eventRecorder),
22422243
policyv1.PodDisruptionBudget{
22432244
ObjectMeta: metav1.ObjectMeta{
2244-
Name: "postgres-myapp-database-pdb",
2245-
Namespace: "myapp",
2246-
Labels: map[string]string{"team": "myapp", "cluster-name": "myapp-database"},
2245+
Name: "postgres-myapp-database-pdb",
2246+
Namespace: "myapp",
2247+
Labels: map[string]string{"team": "myapp", "cluster-name": "myapp-database"},
2248+
OwnerReferences: []metav1.OwnerReference{{Name: "myapp-database"}},
22472249
},
22482250
Spec: policyv1.PodDisruptionBudgetSpec{
22492251
MinAvailable: util.ToIntStr(0),
@@ -2265,9 +2267,10 @@ func TestGeneratePodDisruptionBudget(t *testing.T) {
22652267
eventRecorder),
22662268
policyv1.PodDisruptionBudget{
22672269
ObjectMeta: metav1.ObjectMeta{
2268-
Name: "postgres-myapp-database-pdb",
2269-
Namespace: "myapp",
2270-
Labels: map[string]string{"team": "myapp", "cluster-name": "myapp-database"},
2270+
Name: "postgres-myapp-database-pdb",
2271+
Namespace: "myapp",
2272+
Labels: map[string]string{"team": "myapp", "cluster-name": "myapp-database"},
2273+
OwnerReferences: []metav1.OwnerReference{{Name: "myapp-database"}},
22712274
},
22722275
Spec: policyv1.PodDisruptionBudgetSpec{
22732276
MinAvailable: util.ToIntStr(0),

0 commit comments

Comments
 (0)