review

cryostatio · Apr 10, 2024 · 2f7b5e6 · 2f7b5e6
1 parent 38e4d6e
commit 2f7b5e6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -54,7 +54,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:2.5.0-dev
-    createdAt: "2024-03-27T17:54:03Z"
+    createdAt: "2024-04-10T02:34:20Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {

diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml
@@ -70,7 +70,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240404171629
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739
     labels:
       suite: cryostat
       test: operator-install
@@ -80,7 +80,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240404171629
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -90,7 +90,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-multi-namespace
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240404171629
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739
     labels:
       suite: cryostat
       test: cryostat-multi-namespace
@@ -100,7 +100,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240404171629
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -110,7 +110,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240404171629
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -120,7 +120,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
-    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240404171629
+    image: quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739
     labels:
       suite: cryostat
       test: cryostat-report

diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml
@@ -8,7 +8,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240327175405"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739"
     labels:
       suite: cryostat
       test: operator-install
@@ -18,7 +18,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240327175405"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739"
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -28,7 +28,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-multi-namespace
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240404171725"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739"
     labels:
       suite: cryostat
       test: cryostat-multi-namespace
@@ -38,7 +38,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240327175405"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739"
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -48,7 +48,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240327175405"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739"
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -58,7 +58,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
-    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240327175405"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:2.5.0-20240410022739"
     labels:
       suite: cryostat
       test: cryostat-report
diff --git a/internal/test/scorecard/common_utils.go b/internal/test/scorecard/common_utils.go
@@ -513,11 +513,11 @@ func (r *TestResources) sendHealthRequest(base *url.URL, healthCheck func(resp *
 	return err
 }
 
-func (r *TestResources) updateAndWaitTillCryostatAvailable(cr *operatorv1beta1.Cryostat) error {
+func (r *TestResources) updateAndWaitTillCryostatAvailable(cr *operatorv1beta1.Cryostat) (*operatorv1beta1.Cryostat, error) {
 	ctx := context.Background()
 
 	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
-		cr, err := r.Client.OperatorCRDs().Cryostats(cr.Namespace).Get(ctx, CryostatConfigChangeTestName)
+		cr, err := r.Client.OperatorCRDs().Cryostats(cr.Namespace).Get(ctx, cr.Name)
 		if err != nil {
 			return fmt.Errorf("failed to get Cryostat CR: %s", err.Error())
 		}
@@ -535,11 +535,11 @@ func (r *TestResources) updateAndWaitTillCryostatAvailable(cr *operatorv1beta1.C
 			},
 		}
 
-		_, err = r.Client.OperatorCRDs().Cryostats(cr.Namespace).Update(context.Background(), cr)
+		cr, err = r.Client.OperatorCRDs().Cryostats(cr.Namespace).Update(context.Background(), cr)
 		return err
 	})
 	if err != nil {
-		return fmt.Errorf("failed to update Cryostat CR: %s", err.Error())
+		return nil, fmt.Errorf("failed to update Cryostat CR: %s", err.Error())
 	}
 
 	// Poll the deployment until it becomes available or we timeout
@@ -593,9 +593,9 @@ func (r *TestResources) updateAndWaitTillCryostatAvailable(cr *operatorv1beta1.C
 		return false, nil
 	})
 	if err != nil {
-		return fmt.Errorf("failed to look up deployment errors: %s", err.Error())
+		return nil, fmt.Errorf("failed to look up deployment errors: %s", err.Error())
 	}
-	return err
+	return cr, err
 }
 
 func (r *TestResources) cleanupAndLogs(name string, namespace string) {

diff --git a/internal/test/scorecard/tests.go b/internal/test/scorecard/tests.go
@@ -126,13 +126,14 @@ func CryostatConfigChangeTest(bundle *apimanifests.Bundle, namespace string, ope
 	}
 
 	// Switch Cryostat CR to PVC for redeployment
-	err = r.updateAndWaitTillCryostatAvailable(cr)
+	cr, err = r.updateAndWaitTillCryostatAvailable(cr)
 	if err != nil {
 		return r.fail(fmt.Sprintf("Cryostat redeployment did not become available: %s", err.Error()))
 	}
 	r.Log += "Cryostat deployment has successfully updated with new spec template\n"
 
 	base, err := url.Parse(cr.Status.ApplicationURL)
+	r.Log += fmt.Sprintf("base url: %s\n", base)
 	if err != nil {
 		return r.fail(fmt.Sprintf("application URL is invalid: %s", err.Error()))
 	}