Add tests

Makefile

@@ -85,6 +85,11 @@ install-samples: export KUBECONFIG = $(KIND_KUBECONFIG)
 install-samples: generate-go install-crd ## Install samples into cluster
 	yq package/samples/*.yaml | kubectl apply -f -
 
+.PHONY: delete-instance
+delete-instance: export KUBECONFIG = $(KIND_KUBECONFIG)
+delete-instance:  ## Deletes sample instance if it exists
+	kubectl delete -f package/samples/postgresql.appcat.vshn.io_postgresqlstandalone.yaml --ignore-not-found=true
+
 .PHONY: run-operator
 run-operator: ## Run in Operator mode against your current kube context
 	go run . -v 1 operator

operator/operatortest/envtest.go

@@ -60,8 +60,8 @@ func (ts *Suite) SetupSuite() {
 
 	info, err := os.Stat(envtestAssets)
 	absEnvtestAssets, _ := filepath.Abs(envtestAssets)
-	ts.Require().NoErrorf(err, "'%s' does not seem to exist. Check KUBEBUILDER_ASSETS and make sure you run `make integration-test` before you run this test in your IDE.", absEnvtestAssets)
-	ts.Require().Truef(info.IsDir(), "'%s' does not seem to be a directory. Check KUBEBUILDER_ASSETS and make sure you run `make integration-test` before you run this test in your IDE.", absEnvtestAssets)
+	ts.Require().NoErrorf(err, "'%s' does not seem to exist. Check KUBEBUILDER_ASSETS and make sure you run `make test-integration` before you run this test in your IDE.", absEnvtestAssets)
+	ts.Require().Truef(info.IsDir(), "'%s' does not seem to be a directory. Check KUBEBUILDER_ASSETS and make sure you run `make test-integration` before you run this test in your IDE.", absEnvtestAssets)
 
 	absCrds, _ := filepath.Abs(crdDir)
 	info, err = os.Stat(crdDir)

operator/standalone/create_it_test.go

@@ -76,7 +76,7 @@ func (ts *CreateStandalonePipelineSuite) Test_FetchOperatorConfig() {
 			p := &CreateStandalonePipeline{
 				operatorNamespace: tc.givenNamespace,
 				client:            ts.Client,
-				instance:          newInstance("instance"),
+				instance:          newInstance("instance", "my-app"),
 			}
 			tc.prepare()
 			err := p.fetchOperatorConfig(ts.Context)
@@ -93,7 +93,7 @@ func (ts *CreateStandalonePipelineSuite) Test_FetchOperatorConfig() {
 func (ts *CreateStandalonePipelineSuite) Test_EnsureDeploymentNamespace() {
 	// Arrange
 	p := &CreateStandalonePipeline{
-		instance: newInstance("test-ensure-namespace"),
+		instance: newInstance("test-ensure-namespace", "my-app"),
 		client:   ts.Client,
 	}
 	currentRand := namegeneratorRNG
@@ -117,7 +117,7 @@ func (ts *CreateStandalonePipelineSuite) Test_EnsureCredentialSecret() {
 	ns := ServiceNamespacePrefix + "my-app-instance"
 	ts.EnsureNS(ns)
 	p := &CreateStandalonePipeline{
-		instance:            newInstance("instance"),
+		instance:            newInstance("instance", "my-app"),
 		client:              ts.Client,
 		deploymentNamespace: &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: ns}},
 	}
@@ -137,7 +137,7 @@ func (ts *CreateStandalonePipelineSuite) Test_EnsureCredentialSecret() {
 func (ts *CreateStandalonePipelineSuite) Test_EnsureHelmRelease() {
 	// Arrange
 	p := &CreateStandalonePipeline{
-		instance:   newInstance("instance"),
+		instance:   newInstance("instance", "my-app"),
 		client:     ts.Client,
 		helmChart:  &v1alpha1.ChartMeta{Repository: "https://host/path", Version: "version", Name: "postgres"},
 		helmValues: helmvalues.V{"key": "value"},
@@ -160,7 +160,7 @@ func (ts *CreateStandalonePipelineSuite) Test_EnsureHelmRelease() {
 func (ts *CreateStandalonePipelineSuite) Test_EnrichStatus() {
 	// Arrange
 	p := &CreateStandalonePipeline{
-		instance:            newInstance("enrich-status"),
+		instance:            newInstance("enrich-status", "my-app"),
 		client:              ts.Client,
 		helmChart:           &v1alpha1.ChartMeta{Repository: "https://host/path", Version: "version", Name: "postgres"},
 		deploymentNamespace: &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: generateClusterScopedNameForInstance()}},
@@ -186,7 +186,7 @@ func (ts *CreateStandalonePipelineSuite) Test_EnrichStatus() {
 func (ts *CreateStandalonePipelineSuite) Test_FetchHelmRelease() {
 	// Arrange
 	p := &CreateStandalonePipeline{
-		instance: newInstance("fetch-release"),
+		instance: newInstance("fetch-release", "my-app"),
 		client:   ts.Client,
 	}
 	p.instance.Status.HelmChart = &v1alpha1.ChartMetaStatus{
@@ -208,7 +208,7 @@ func (ts *CreateStandalonePipelineSuite) Test_FetchHelmRelease() {
 func (ts *CreateStandalonePipelineSuite) Test_FetchCredentialSecret() {
 	// Arrange
 	p := CreateStandalonePipeline{
-		instance: newInstance("fetch-credentials"),
+		instance: newInstance("fetch-credentials", "my-app"),
 	}
 	credentialSecret := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
@@ -241,7 +241,7 @@ func (ts *CreateStandalonePipelineSuite) Test_FetchCredentialSecret() {
 func (ts *CreateStandalonePipelineSuite) Test_FetchService() {
 	// Arrange
 	p := CreateStandalonePipeline{
-		instance: newInstance("fetch-service"),
+		instance: newInstance("fetch-service", "my-app"),
 	}
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{

operator/standalone/create_test.go

@@ -115,7 +115,7 @@ func TestCreateStandalonePipeline_OverrideTemplateValues(t *testing.T) {
 func TestCreateStandalonePipeline_ApplyValuesFromInstance(t *testing.T) {
 	p := CreateStandalonePipeline{
 		config:   newPostgresqlStandaloneOperatorConfig("cfg", "postgresql-system"),
-		instance: newInstance("instance"),
+		instance: newInstance("instance", "my-app"),
 	}
 	err := p.applyValuesFromInstance(nil)
 	require.NoError(t, err)
@@ -153,7 +153,7 @@ func TestCreateStandalonePipeline_ApplyValuesFromInstance(t *testing.T) {
 
 func TestCreateStandalonePipeline_IsHelmReleaseReady(t *testing.T) {
 	p := CreateStandalonePipeline{
-		instance: newInstance("release-ready"),
+		instance: newInstance("release-ready", "my-app"),
 	}
 	p.instance.Status.HelmChart = &v1alpha1.ChartMetaStatus{}
 
@@ -207,9 +207,9 @@ func newPostgresqlStandaloneOperatorConfig(name string, namespace string) *v1alp
 		},
 	}
 }
-func newInstance(name string) *v1alpha1.PostgresqlStandalone {
+func newInstance(name string, namespace string) *v1alpha1.PostgresqlStandalone {
 	return &v1alpha1.PostgresqlStandalone{
-		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "my-app"},
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
 		Spec: v1alpha1.PostgresqlStandaloneSpec{
 			Parameters: v1alpha1.PostgresqlStandaloneParameters{
 				MajorVersion:    v1alpha1.PostgresqlVersion14,

operator/standalone/delete.go

@@ -50,27 +50,29 @@ func (d *DeleteStandalonePipeline) RunPipeline(ctx context.Context) error {
 func (d *DeleteStandalonePipeline) deleteHelmRelease(ctx context.Context) error {
 	helmRelease := &helmv1beta1.Release{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      d.instance.Status.HelmChart.DeploymentNamespace,
-			Namespace: d.instance.Status.HelmChart.DeploymentNamespace,
+			Name: d.instance.Status.HelmChart.DeploymentNamespace,
 		},
 	}
 	err := d.client.Delete(ctx, helmRelease)
 	if err != nil && apierrors.IsNotFound(err) {
 		d.helmReleaseDeleted = true
 	}
-	return skipOnNotFound(err)
+	return client.IgnoreNotFound(err)
 }
 
 // deleteNamespace removes the namespace of the PostgreSQL instance
 // We delete the namespace only if the Helm Release has been deleted
 func (d *DeleteStandalonePipeline) deleteNamespace(ctx context.Context) error {
 	deploymentNamespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      d.instance.Status.HelmChart.DeploymentNamespace,
-			Namespace: d.instance.Status.HelmChart.DeploymentNamespace,
+			Name: d.instance.Status.HelmChart.DeploymentNamespace,
 		},
 	}
-	return skipOnNotFound(d.client.Delete(ctx, deploymentNamespace))
+	propagation := metav1.DeletePropagationBackground
+	deleteOptions := &client.DeleteOptions{
+		PropagationPolicy: &propagation,
+	}
+	return client.IgnoreNotFound(d.client.Delete(ctx, deploymentNamespace, deleteOptions))
 }
 
 // deleteConnectionSecret removes the connection secret of the PostgreSQL instance
@@ -81,24 +83,18 @@ func (d *DeleteStandalonePipeline) deleteConnectionSecret(ctx context.Context) e
 			Namespace: d.instance.Namespace,
 		},
 	}
-	return skipOnNotFound(d.client.Delete(ctx, connectionSecret))
+	return client.IgnoreNotFound(d.client.Delete(ctx, connectionSecret))
 }
 
 // removeFinalizer removes the finalizer from the PostgreSQL CRD
 func (d *DeleteStandalonePipeline) removeFinalizer(ctx context.Context) error {
-	controllerutil.RemoveFinalizer(d.instance, finalizer)
-	return d.client.Update(ctx, d.instance)
+	if controllerutil.RemoveFinalizer(d.instance, finalizer) {
+		return d.client.Update(ctx, d.instance)
+	}
+	return nil
 }
 
 // isHelmReleaseDeleted checks whether the Release was completely deleted
 func (d *DeleteStandalonePipeline) isHelmReleaseDeleted(_ context.Context) bool {
 	return d.helmReleaseDeleted
 }
-
-// skipOnNotFound treats not found error as nil
-func skipOnNotFound(err error) error {
-	if err != nil && !apierrors.IsNotFound(err) {
-		return err
-	}
-	return nil
-}