Add tests

Author: LimKianAn

controllers/postgres_controller_test.go

@@ -10,12 +10,12 @@ import (
 	"time"
 
 	pg "github.com/fi-ts/postgreslet/api/v1"
+	"github.com/fi-ts/postgreslet/pkg/operatormanager"
 	firewall "github.com/metal-stack/firewall-controller/api/v1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	zalando "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1"
 	core "k8s.io/api/core/v1"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 )
 
@@ -53,6 +53,15 @@ var _ = Describe("postgres controller", func() {
 			}, timeout, interval).Should(BeTrue())
 		})
 
+		It("should create pod-environment-configmap in service-cluster", func() {
+			Eventually(func() bool {
+				return svcClusterClient.Get(newCtx(), types.NamespacedName{
+					Namespace: instance.ToPeripheralResourceNamespace(),
+					Name:      operatormanager.PodEnvCMName,
+				}, &core.ConfigMap{}) == nil
+			}, timeout, interval).Should(BeTrue())
+		})
+
 		It("should create zalando postgresql in service-cluster", func() {
 			z := &zalando.Postgresql{}
 			Eventually(func() bool {
@@ -67,7 +76,7 @@ var _ = Describe("postgres controller", func() {
 				return svcClusterClient.Get(newCtx(), types.NamespacedName{
 					Namespace: instance.ToPeripheralResourceNamespace(),
 					Name:      instance.ToSvcLBName(),
-				}, &corev1.Service{}) == nil
+				}, &core.Service{}) == nil
 			}, timeout, interval).Should(BeTrue())
 		})
 
@@ -97,7 +106,7 @@ var _ = Describe("postgres controller", func() {
 				return svcClusterClient.Get(newCtx(), types.NamespacedName{
 					Namespace: instance.ToPeripheralResourceNamespace(),
 					Name:      instance.ToSvcLBName(),
-				}, &corev1.Service{}) == nil
+				}, &core.Service{}) == nil
 			}, timeout, interval).ShouldNot(BeTrue())
 		})
 

controllers/suite_test.go

@@ -135,7 +135,7 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(svcClusterClient).ToNot(BeNil())
 
 	createNamespace(svcClusterClient, "firewall")
-	createPostgresTestInstance()
+	createPostgresTestInstance(createBackupSecret())
 	createConfigMapSidecarConfig()
 	createCredentialSecrets()
 }, 1000)
@@ -150,6 +150,20 @@ var _ = AfterSuite(func() {
 	Expect(err).ToNot(HaveOccurred())
 })
 
+func createBackupSecret() *core.Secret {
+	backupSecret := &core.Secret{}
+	bytes, err := os.ReadFile(filepath.Join(externalYAMLDirTest, "secret-backup.yaml"))
+	Expect(err).ToNot(HaveOccurred())
+	Expect(yaml.Unmarshal(bytes, backupSecret)).Should(Succeed())
+
+	// Available in production, but not here
+	createNamespace(ctrlClusterClient, backupSecret.Namespace)
+
+	Expect(ctrlClusterClient.Create(newCtx(), backupSecret)).Should(Succeed())
+
+	return backupSecret
+}
+
 func createCredentialSecrets() {
 	defer GinkgoRecover()
 
@@ -191,14 +205,15 @@ func createNamespace(client client.Client, ns string) {
 	Expect(client.Create(newCtx(), nsObj)).Should(Succeed())
 }
 
-func createPostgresTestInstance() {
+func createPostgresTestInstance(backupSecret *core.Secret) {
 	defer GinkgoRecover()
 
+	// Parse the test instance
 	bytes, err := os.ReadFile(filepath.Join("..", "config", "samples", "complete.yaml"))
 	Expect(err).ToNot(HaveOccurred())
 	Expect(yaml.Unmarshal(bytes, instance)).Should(Succeed())
 
-	createNamespace(ctrlClusterClient, instance.Namespace)
+	instance.Spec.BackupSecretRef = backupSecret.Name
 
 	Expect(ctrlClusterClient.Create(newCtx(), instance)).Should(Succeed())
 }

external/test/secret-backup.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+data:
+  config: eyJpZCI6IjgxZWEyMzMxLTliMTQtNDUyMi05MjgzLTdkOGQwYmM2YjExNSIsIm5hbWUiOiJuYmctcHJvZC10ZXN0IiwicHJvamVjdCI6ImI2MjFlYjk5LTQ4ODgtNDkxMS05M2ZjLTk1ODU0ZmMwMzBlOCIsInRlbmFudCI6ImZpdHMiLCJjcmVhdGVkQnkiOiJcdTAwM2NpemUwMDBcdTAwM2VbYWNoaW0uYWRtaW5AZi1pLXRzLmRlXSIsInJldGVudGlvbiI6IjQiLCJzY2hlZHVsZSI6IjMwIDAwICogKiAqIiwiczNlbmRwb2ludCI6Imh0dHBzOi8vczMucHJvZC0wMy1uYmctdzgxMDEuZml0cy5jbG91ZCIsInMzYnVja2V0bmFtZSI6ImJhY2t1cC0xMjM0NTY3OCIsInMzcmVnaW9uIjoiZHVtbXkiLCJzM2FjY2Vzc2tleSI6IjRJMjUyOFA4UkcwOThYU1NDUEJNIiwiczNzZWNyZXRrZXkiOiJJSXBCOHBjU2tLVVF2MVhadmN6RU1XM0VrbERhUmU1N0FpM2FGdllCIn0=
+kind: Secret
+metadata:
+  labels:
+    postgres.database.fits.cloud/is-backup: "true"
+    postgres.database.fits.cloud/project-id: b621eb99-4888-4911-93fc-95854fc030e8
+    postgres.database.fits.cloud/tenant: fits
+  name: 81ea2331-9b14-4522-9283-7d8d0bc6b115
+  namespace: metal-extension-cloud
+type: Opaque

pkg/operatormanager/operatormanager.go

@@ -71,7 +71,7 @@ type OperatorManager struct {
 }
 
 // New creates a new `OperatorManager`
-func New(CtrlClient client.Client, conf *rest.Config, fileName string, scheme *runtime.Scheme, log logr.Logger, pspName string) (*OperatorManager, error) {
+func New(ctrlClient client.Client, conf *rest.Config, fileName string, scheme *runtime.Scheme, log logr.Logger, pspName string) (*OperatorManager, error) {
 	// Use no-cache client to avoid waiting for cashing.
 	client, err := client.New(conf, client.Options{
 		Scheme: scheme,
@@ -95,6 +95,7 @@ func New(CtrlClient client.Client, conf *rest.Config, fileName string, scheme *r
 	log.Info("new `OperatorManager` created")
 	return &OperatorManager{
 		MetadataAccessor: meta.NewAccessor(),
+		CtrlClient:       ctrlClient,
 		Client:           client,
 		Decoder:          deserializer,
 		list:             list,