remove check for label/anno in AddToSyncedConfig, fix test

Signed-off-by: gazarenkov <[email protected]>

integration_tests/config-refresh_test.go

@@ -0,0 +1,177 @@
+//
+// Copyright (c) 2023 Red Hat, Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package integration_tests
+
+import (
+	"context"
+	"fmt"
+	"redhat-developer/red-hat-developer-hub-operator/pkg/utils"
+	"strings"
+	"time"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	corev1 "k8s.io/api/core/v1"
+
+	appsv1 "k8s.io/api/apps/v1"
+
+	"redhat-developer/red-hat-developer-hub-operator/pkg/model"
+
+	bsv1 "redhat-developer/red-hat-developer-hub-operator/api/v1alpha2"
+
+	"k8s.io/apimachinery/pkg/types"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = When("create backstage with external configuration", func() {
+
+	var (
+		ctx context.Context
+		ns  string
+	)
+
+	BeforeEach(func() {
+		ctx = context.Background()
+		ns = createNamespace(ctx)
+	})
+
+	AfterEach(func() {
+		deleteNamespace(ctx, ns)
+	})
+
+	It("refresh config", func() {
+
+		if !*testEnv.UseExistingCluster {
+			Skip("Skipped for not real cluster")
+		}
+
+		appConfig1 := "app-config1"
+		secretEnv1 := "secret-env1"
+
+		backstageName := generateRandName("")
+
+		conf := `
+organization:
+  name: "my org"
+`
+
+		generateConfigMap(ctx, k8sClient, appConfig1, ns, map[string]string{"appconfig11": conf}, nil, nil)
+		generateSecret(ctx, k8sClient, secretEnv1, ns, map[string]string{"sec11": "val11"}, nil, nil)
+
+		bs := bsv1.BackstageSpec{
+			Application: &bsv1.Application{
+				AppConfig: &bsv1.AppConfig{
+					MountPath: "/my/mount/path",
+					ConfigMaps: []bsv1.ObjectKeyRef{
+						{Name: appConfig1},
+					},
+				},
+				ExtraEnvs: &bsv1.ExtraEnvs{
+					Secrets: []bsv1.ObjectKeyRef{
+						{Name: secretEnv1, Key: "sec11"},
+					},
+				},
+			},
+		}
+
+		createAndReconcileBackstage(ctx, ns, bs, backstageName)
+
+		Eventually(func(g Gomega) {
+			deploy := &appsv1.Deployment{}
+			err := k8sClient.Get(ctx, types.NamespacedName{Namespace: ns, Name: model.DeploymentName(backstageName)}, deploy)
+			g.Expect(err).ShouldNot(HaveOccurred())
+
+			podList := &corev1.PodList{}
+			err = k8sClient.List(ctx, podList, client.InNamespace(ns), client.MatchingLabels{model.BackstageAppLabel: utils.BackstageAppLabelValue(backstageName)})
+			g.Expect(err).ShouldNot(HaveOccurred())
+
+			g.Expect(len(podList.Items)).To(Equal(1))
+			podName := podList.Items[0].Name
+			out, _, err := executeRemoteCommand(ctx, ns, podName, "backstage-backend", "cat /my/mount/path/appconfig11")
+			g.Expect(err).ShouldNot(HaveOccurred())
+			out = strings.Replace(out, "\r", "", -1)
+			g.Expect(out).To(Equal(conf))
+
+			out, _, err = executeRemoteCommand(ctx, ns, podName, "backstage-backend", "echo $sec11")
+			g.Expect(err).ShouldNot(HaveOccurred())
+			g.Expect("val11\r\n").To(Equal(out))
+
+		}, 5*time.Minute, 10*time.Second).Should(Succeed(), controllerMessage())
+
+		cm := &corev1.ConfigMap{}
+		err := k8sClient.Get(ctx, types.NamespacedName{Namespace: ns, Name: appConfig1}, cm)
+		Expect(err).ShouldNot(HaveOccurred())
+
+		// update appconfig11
+		newData := `
+organization:
+  name: "another org"
+`
+		cm.Data = map[string]string{"appconfig11": newData}
+		err = k8sClient.Update(ctx, cm)
+		Expect(err).ShouldNot(HaveOccurred())
+
+		Eventually(func(g Gomega) {
+			err = k8sClient.Get(ctx, types.NamespacedName{Namespace: ns, Name: appConfig1}, cm)
+			g.Expect(err).ShouldNot(HaveOccurred())
+			g.Expect(cm.Data["appconfig11"]).To(Equal(newData))
+
+			// Pod replaced so have to re-ask
+			podList := &corev1.PodList{}
+			err = k8sClient.List(ctx, podList, client.InNamespace(ns), client.MatchingLabels{model.BackstageAppLabel: utils.BackstageAppLabelValue(backstageName)})
+			g.Expect(err).ShouldNot(HaveOccurred())
+
+			podName := podList.Items[0].Name
+			out, _, err := executeRemoteCommand(ctx, ns, podName, "backstage-backend", "cat /my/mount/path/appconfig11")
+			g.Expect(err).ShouldNot(HaveOccurred())
+			// TODO nicer method to compare file content with added '\r'
+			g.Expect(strings.ReplaceAll(out, "\r", "")).To(Equal(newData))
+
+			//_, _, err = executeRemoteCommand(ctx, ns, podName, "backstage-backend", "cat /my/mount/path/key12")
+			//g.Expect(err).Should(HaveOccurred())
+
+		}, 10*time.Minute, 10*time.Second).Should(Succeed(), controllerMessage())
+
+		sec := &corev1.Secret{}
+		err = k8sClient.Get(ctx, types.NamespacedName{Namespace: ns, Name: secretEnv1}, sec)
+		Expect(err).ShouldNot(HaveOccurred())
+		newEnv := "val22"
+		sec.StringData = map[string]string{"sec11": newEnv}
+		err = k8sClient.Update(ctx, sec)
+		Expect(err).ShouldNot(HaveOccurred())
+
+		Eventually(func(g Gomega) {
+
+			err = k8sClient.Get(ctx, types.NamespacedName{Namespace: ns, Name: secretEnv1}, sec)
+			g.Expect(err).ShouldNot(HaveOccurred())
+
+			// Pod replaced so have to re-ask
+			podList := &corev1.PodList{}
+			err = k8sClient.List(ctx, podList, client.InNamespace(ns), client.MatchingLabels{model.BackstageAppLabel: utils.BackstageAppLabelValue(backstageName)})
+			g.Expect(err).ShouldNot(HaveOccurred())
+
+			podName := podList.Items[0].Name
+
+			out, _, err := executeRemoteCommand(ctx, ns, podName, "backstage-backend", "echo $sec11")
+			g.Expect(err).ShouldNot(HaveOccurred())
+			g.Expect(fmt.Sprintf("%s%s", newEnv, "\r\n")).To(Equal(out))
+
+		}, 10*time.Minute, 10*time.Second).Should(Succeed(), controllerMessage())
+
+	})
+
+})