Update test case for Value Reference in Template

Signed-off-by: Daniel Fan <[email protected]>

controllers/operandrequest/operandrequest_controller_test.go

@@ -43,7 +43,7 @@ var _ = Describe("OperandRequest controller", func() {
 		namespace         = "ibm-cloudpak"
 		registryName1     = "common-service"
 		registryName2     = "common-service-2"
-		registryNamespace = "ibm-common-services"
+		registryNamespace = "data-ns"
 		operatorNamespace = "ibm-operators"
 	)
 
@@ -319,6 +319,12 @@ var _ = Describe("OperandRequest controller", func() {
 				return err
 			}, testutil.Timeout, testutil.Interval).Should(Succeed())
 
+			Eventually(func() error {
+				jaegerConfigMap := &corev1.ConfigMap{}
+				err := k8sClient.Get(context.TODO(), types.NamespacedName{Name: "jaeger-configmap-reference", Namespace: registryNamespaceName}, jaegerConfigMap)
+				return err
+			}, testutil.Timeout, testutil.Interval).Should(Succeed())
+
 			By("Disabling the jaeger operator from first OperandRequest")
 			requestInstance1 := &operatorv1alpha1.OperandRequest{}
 			Expect(k8sClient.Get(ctx, requestKey1, requestInstance1)).Should(Succeed())
@@ -364,6 +370,11 @@ var _ = Describe("OperandRequest controller", func() {
 				err := k8sClient.Get(context.TODO(), types.NamespacedName{Name: "jaeger-configmap", Namespace: registryNamespaceName}, jaegerConfigMap)
 				return err != nil && errors.IsNotFound(err)
 			}, testutil.Timeout, testutil.Interval).Should(BeTrue())
+			Eventually(func() bool {
+				jaegerConfigMap := &corev1.ConfigMap{}
+				err := k8sClient.Get(context.TODO(), types.NamespacedName{Name: "jaeger-configmap-reference", Namespace: registryNamespaceName}, jaegerConfigMap)
+				return err != nil && errors.IsNotFound(err)
+			}, testutil.Timeout, testutil.Interval).Should(BeTrue())
 
 			By("Checking operators have been deleted")
 			Eventually(func() bool {

controllers/operator/manager.go

@@ -679,6 +679,6 @@ func (m *ODLMOperator) GetValueRefFromObject(ctx context.Context, instanceType,
 		return "", errors.Errorf("failed to get path %v from %s %s/%s, the value is not found", path, obj.GetKind(), obj.GetNamespace(), obj.GetName())
 	}
 
-	klog.Infof("Get value %s from %s %s/%s", value, objKind, obj.GetNamespace(), obj.GetName())
+	klog.V(2).Infof("Get value %s from %s %s/%s", value, objKind, obj.GetNamespace(), obj.GetName())
 	return value, nil
 }

controllers/testutil/test_util.go

@@ -56,7 +56,7 @@ var SubConfig = &olmv1alpha1.SubscriptionConfig{
 
 // CreateNSName generates random namespace names. Namespaces are never deleted in test environment
 func CreateNSName(prefix string) string {
-	suffix := make([]byte, 10)
+	suffix := make([]byte, 4)
 	_, err := rand.Read(suffix)
 	if err != nil {
 		panic(err)
@@ -142,7 +142,18 @@ func OperandConfigObj(name, namespace string) *apiv1alpha1.OperandConfig {
 					Name: "jaeger",
 					Spec: map[string]apiv1alpha1.ExtensionWithMarker{
 						"jaeger": {
-							RawExtension: runtime.RawExtension{Raw: []byte(`{"strategy": "streaming"}`)},
+							RawExtension: runtime.RawExtension{Raw: []byte(`{
+								"strategy": {
+								  "templatingValueFrom": {
+									"required": true,
+									"configMapKeyRef": {
+									  "name": "jaeger-configmap-reference",
+									  "key": "putStrategy"
+									}
+								  }
+								}
+							  }`),
+							},
 						},
 					},
 					Resources: []apiv1alpha1.ConfigResource{
@@ -161,6 +172,36 @@ func OperandConfigObj(name, namespace string) *apiv1alpha1.OperandConfig {
 							},
 							Force: false,
 						},
+						{
+							Name:       "jaeger-configmap-reference",
+							APIVersion: "v1",
+							Kind:       "ConfigMap",
+							Labels: map[string]string{
+								"jaeger": "jaeger-configmap-reference",
+							},
+							Annotations: map[string]string{
+								"jaeger": "jaeger-configmap-reference",
+							},
+							Data: &runtime.RawExtension{
+								Raw: []byte(`{
+									"data": {
+									  "getStrategy": {
+										"templatingValueFrom": {
+										  "required": true,
+										  "objectRef": {
+											"apiVersion": "v1",
+											"kind": "ConfigMap",
+											"name": "jaeger-configmap",
+											"path": "data.strategy"
+										  }
+										}
+									  },
+									  "putStrategy": "streaming"
+									}
+								}`),
+							},
+							Force: false,
+						},
 					},
 				},
 				{