Merge "Add software factory reconcile test"

Author: Microzuul CI

.gitignore

@@ -31,6 +31,7 @@ config/manager/kustomization.yaml
 
 my-sf.yaml
 config/crd/bases/_.yaml
+config/crd/vendor/
 
 # python sf_operator
 .eggs

Makefile

@@ -82,7 +82,7 @@ doc-serve: mkdocs
 	$(LOCALBIN)/mkdocs/bin/mkdocs serve
 
 .PHONY: test
-test: manifests generate fmt vet envtest ## Run tests.
+test: manifests generate fmt vet envtest vendor-crds ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
 ##@ Build
@@ -216,6 +216,11 @@ staticcheck:
 	mkdir -p $(GOBIN)
 	test -L $(GOBIN)/staticcheck || ln -s $(LOCALBIN)/staticcheck $(GOBIN)/staticcheck
 
+.PHONY: vendor-crds
+vendor-crds:
+	@mkdir -p config/crd/vendor/
+	@(test -f config/crd/vendor/monitoring.yaml || curl -Lo config/crd/vendor/monitoring.yaml https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.82.2/stripped-down-crds.yaml)
+
 # Catalog
 CATALOG_DIR=sf-operator-catalog
 CATALOG_FILE=$(CATALOG_DIR)/catalog.yaml

controllers/softwarefactory_controller_test.go

@@ -0,0 +1,83 @@
+// Copyright (C) 2025 Red Hat
+// SPDX-License-Identifier: Apache-2.0
+
+package controllers
+
+import (
+	"context"
+
+	//nolint:golint
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	sfv1 "github.com/softwarefactory-project/sf-operator/api/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	// "sigs.k8s.io/controller-runtime/pkg/client"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+)
+
+var _ = Describe("SoftwareFactory controller", func() {
+	Context("SoftwareFactory CR validation", func() {
+
+		const TestName = "test-cr"
+
+		ctx := context.Background()
+
+		namespace := &corev1.Namespace{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      TestName,
+				Namespace: TestName,
+			},
+		}
+		typeNamespaceName := types.NamespacedName{
+			Name:      TestName,
+			Namespace: TestName,
+		}
+		sf := &sfv1.SoftwareFactory{}
+		BeforeEach(func() {
+			By("Creating the Namespace to perform the tests")
+			err := k8sClient.Create(ctx, namespace)
+			Expect(err).To(Not(HaveOccurred()))
+
+			By("creating the custom resource for the Kind SoftwareFactory")
+			err = k8sClient.Get(ctx, typeNamespaceName, sf)
+			if err != nil && errors.IsNotFound(err) {
+				// Let's mock our custom resource at the same way that we would
+				// apply on the cluster the manifest under config/samples
+				sf = &sfv1.SoftwareFactory{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      TestName,
+						Namespace: namespace.Name,
+					},
+					Spec: sfv1.SoftwareFactorySpec{
+						ConfigRepositoryLocation: sfv1.ConfigRepositoryLocationSpec{
+							Name:               "config",
+							ZuulConnectionName: "conn",
+						},
+					},
+				}
+
+				err = k8sClient.Create(ctx, sf)
+				Expect(err).To(Not(HaveOccurred()))
+			}
+		})
+		AfterEach(func() {
+			k8sClient.Delete(context.TODO(), sf)
+		})
+
+		It("Should use reconcile", func() {
+			sfReconciler := &SoftwareFactoryReconciler{
+				Client:     k8sClient,
+				Scheme:     k8sClient.Scheme(),
+				CancelFunc: cancel,
+			}
+
+			sfReconciler.Reconcile(ctx, reconcile.Request{
+				NamespacedName: typeNamespaceName,
+			})
+
+		})
+	})
+})

controllers/suite_test.go

@@ -32,6 +32,8 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+	opv1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	monitoring "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	sfv1 "github.com/softwarefactory-project/sf-operator/api/v1"
 	//+kubebuilder:scaffold:imports
 )
@@ -78,7 +80,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "config", "crd", "bases"), filepath.Join("..", "config", "crd", "vendor")},
 		ErrorIfCRDPathMissing: true,
 
 		// The BinaryAssetsDirectory is only required if you want to run the tests directly
@@ -98,6 +100,10 @@ var _ = BeforeSuite(func() {
 
 	err = sfv1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
+	err = monitoring.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
+	err = opv1.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
 
 	// +kubebuilder:scaffold:scheme