From 9abd6f7fcc396ad9facd46d9b1c1c3812d242886 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 22 Sep 2021 16:59:15 +0200 Subject: [PATCH] avoid CRD getter in unit test --- pkg/cluster/streams.go | 1 + pkg/cluster/streams_test.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/cluster/streams.go b/pkg/cluster/streams.go index 173305033..07c94f473 100644 --- a/pkg/cluster/streams.go +++ b/pkg/cluster/streams.go @@ -43,6 +43,7 @@ func (c *Cluster) updateStreams(newEventStreams *zalandov1alpha1.FabricEventStre func (c *Cluster) deleteStreams() error { c.setProcessName("deleting event streams") + // check if stream CRD is installed before trying a delete _, err := c.KubeClient.CustomResourceDefinitions().Get(context.TODO(), constants.EventStreamSourceCRDName, metav1.GetOptions{}) if k8sutil.ResourceNotFound(err) { return nil diff --git a/pkg/cluster/streams_test.go b/pkg/cluster/streams_test.go index 617efcc31..725c856b1 100644 --- a/pkg/cluster/streams_test.go +++ b/pkg/cluster/streams_test.go @@ -83,7 +83,7 @@ func TestGenerateFabricEventStream(t *testing.T) { }, }, client, pg, logger, eventRecorder) - err := cluster.syncStreams() + err := cluster.createOrUpdateStreams() assert.NoError(t, err) streamCRD, err := cluster.KubeClient.FabricEventStreams(namespace).Get(context.TODO(), cluster.Name, metav1.GetOptions{}) @@ -117,7 +117,7 @@ func TestUpdateFabricEventStream(t *testing.T) { _, err := cluster.KubeClient.Postgresqls(namespace).Create( context.TODO(), &pg, metav1.CreateOptions{}) assert.NoError(t, err) - err = cluster.syncStreams() + err = cluster.createOrUpdateStreams() assert.NoError(t, err) var pgSpec acidv1.PostgresSpec @@ -140,7 +140,7 @@ func TestUpdateFabricEventStream(t *testing.T) { assert.NoError(t, err) cluster.Postgresql.Spec = pgPatched.Spec - err = cluster.syncStreams() + err = cluster.createOrUpdateStreams() assert.NoError(t, err) streamCRD, err := cluster.KubeClient.FabricEventStreams(namespace).Get(context.TODO(), cluster.Name, metav1.GetOptions{})