fix: integration test

kyma-project · Sep 29, 2024 · 9f3f963 · 9f3f963
1 parent 0591ea2
commit 9f3f963
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/tests/integration/controller/withwatcher/controller_test.go b/tests/integration/controller/withwatcher/controller_test.go
@@ -9,6 +9,7 @@ import (
 
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	apiappsv1 "k8s.io/api/apps/v1"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/kyma-project/lifecycle-manager/api/shared"
@@ -46,7 +47,8 @@ var _ = Describe("Kyma with multiple module CRs in remote sync mode", Ordered, f
 	kymaObjKey := client.ObjectKeyFromObject(kyma)
 	tlsSecret := createTLSSecret(kymaObjKey)
 	caCertificate := createCaCertificate()
-	registerDefaultLifecycleForKymaWithWatcher(kyma, watcherCrForKyma, tlsSecret, issuer, caCertificate)
+	caSecret := createCASecret()
+	registerDefaultLifecycleForKymaWithWatcher(kyma, watcherCrForKyma, tlsSecret, issuer, caCertificate, caSecret)
 	var skrClient client.Client
 	var err error
 	BeforeAll(func() {

diff --git a/tests/integration/controller/withwatcher/watcher_certificate_test.go b/tests/integration/controller/withwatcher/watcher_certificate_test.go
@@ -31,8 +31,8 @@ var _ = Describe("Watcher Certificate Configuration in remote sync mode", Ordere
 	tlsSecret := createTLSSecret(kymaObjKey)
 	skrTLSSecretObjKey := client.ObjectKey{Name: watcher.SkrTLSName, Namespace: flags.DefaultRemoteSyncNamespace}
 	caCertificate := createCaCertificate()
-
-	registerDefaultLifecycleForKymaWithWatcher(kyma, watcherCrForKyma, tlsSecret, issuer, caCertificate)
+	caSecret := createCASecret()
+	registerDefaultLifecycleForKymaWithWatcher(kyma, watcherCrForKyma, tlsSecret, issuer, caCertificate, caSecret)
 	var skrClient client.Client
 	var err error
 	BeforeAll(func() {

diff --git a/tests/integration/controller/withwatcher/watcher_controller_helper_test.go b/tests/integration/controller/withwatcher/watcher_controller_helper_test.go
@@ -44,7 +44,7 @@ var (
 )
 
 func registerDefaultLifecycleForKymaWithWatcher(kyma *v1beta2.Kyma, watcher *v1beta2.Watcher,
-	tlsSecret *apicorev1.Secret, issuer *certmanagerv1.Issuer, caCert *certmanagerv1.Certificate,
+	tlsSecret *apicorev1.Secret, issuer *certmanagerv1.Issuer, caCert *certmanagerv1.Certificate, caSecret *apicorev1.Secret,
 ) {
 	BeforeAll(func() {
 		By("Creating watcher CR")
@@ -57,6 +57,8 @@ func registerDefaultLifecycleForKymaWithWatcher(kyma *v1beta2.Kyma, watcher *v1b
 		Expect(kcpClient.Create(ctx, issuer)).To(Succeed())
 		By("Creating CA Certificate")
 		Expect(kcpClient.Create(ctx, caCert)).To(Succeed())
+		By("Creating CA Secret")
+		Expect(kcpClient.Create(ctx, caSecret)).To(Succeed())
 	})
 
 	AfterAll(func() {
@@ -210,6 +212,24 @@ func createTLSSecret(kymaObjKey client.ObjectKey) *apicorev1.Secret {
 	}
 }
 
+func createCASecret() *apicorev1.Secret {
+	return &apicorev1.Secret{
+		ObjectMeta: apimetav1.ObjectMeta{
+			Name:      "klm-watcher",
+			Namespace: istioSystemNs,
+			Labels: map[string]string{
+				shared.ManagedBy: shared.OperatorName,
+			},
+		},
+		Data: map[string][]byte{
+			"ca.crt":  []byte("jelly"),
+			"tls.crt": []byte("jellyfish"),
+			"tls.key": []byte("jellyfishes"),
+		},
+		Type: apicorev1.SecretTypeOpaque,
+	}
+}
+
 func getWatcher(name string) (*v1beta2.Watcher, error) {
 	watcherCR := &v1beta2.Watcher{}
 	err := kcpClient.Get(ctx,