public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avoid CRD getter in unit test

This commit is contained in:
Felix Kunde 2021-09-22 16:59:15 +02:00
parent c5ea2989ca
commit 9abd6f7fcc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cluster/streams.go
View File

@ -43,6 +43,7 @@ func (c *Cluster) updateStreams(newEventStreams *zalandov1alpha1.FabricEventStre
func (c *Cluster) deleteStreams() error { func (c *Cluster) deleteStreams() error {
c.setProcessName("deleting event streams") 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{}) _, err := c.KubeClient.CustomResourceDefinitions().Get(context.TODO(), constants.EventStreamSourceCRDName, metav1.GetOptions{})
if k8sutil.ResourceNotFound(err) { if k8sutil.ResourceNotFound(err) {
return nil return nil

6
pkg/cluster/streams_test.go
View File

@ -83,7 +83,7 @@ func TestGenerateFabricEventStream(t *testing.T) {
}, },
}, client, pg, logger, eventRecorder) }, client, pg, logger, eventRecorder)
err := cluster.syncStreams() err := cluster.createOrUpdateStreams()
assert.NoError(t, err) assert.NoError(t, err)
streamCRD, err := cluster.KubeClient.FabricEventStreams(namespace).Get(context.TODO(), cluster.Name, metav1.GetOptions{}) 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( _, err := cluster.KubeClient.Postgresqls(namespace).Create(
context.TODO(), &pg, metav1.CreateOptions{}) context.TODO(), &pg, metav1.CreateOptions{})
assert.NoError(t, err) assert.NoError(t, err)
err = cluster.syncStreams() err = cluster.createOrUpdateStreams()
assert.NoError(t, err) assert.NoError(t, err)
var pgSpec acidv1.PostgresSpec var pgSpec acidv1.PostgresSpec
@ -140,7 +140,7 @@ func TestUpdateFabricEventStream(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
cluster.Postgresql.Spec = pgPatched.Spec cluster.Postgresql.Spec = pgPatched.Spec
err = cluster.syncStreams() err = cluster.createOrUpdateStreams()
assert.NoError(t, err) assert.NoError(t, err)
streamCRD, err := cluster.KubeClient.FabricEventStreams(namespace).Get(context.TODO(), cluster.Name, metav1.GetOptions{}) streamCRD, err := cluster.KubeClient.FabricEventStreams(namespace).Get(context.TODO(), cluster.Name, metav1.GetOptions{})