From bf299377cd136ce968b114ccf2bfd0c4fe0532e1 Mon Sep 17 00:00:00 2001 From: Ming Wang Date: Sun, 14 Apr 2024 23:05:49 -0400 Subject: [PATCH] review --- .../cryostat-operator.clusterserviceversion.yaml | 2 +- bundle/tests/scorecard/config.yaml | 12 ++++++------ config/scorecard/patches/custom.config.yaml | 12 ++++++------ internal/test/scorecard/common_utils.go | 3 ++- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index 960e558f9..846bd4a61 100644 --- 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-16T20:46:24Z" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index f536a45d3..c4cdfad27 100644 --- 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-20240416204604 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-20240416204604 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-20240416204604 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-20240416204604 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-20240416204604 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-20240416204604 labels: suite: cryostat test: cryostat-report diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml index e0b21f101..f1f7f897b 100644 --- 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-20240416204604" 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-20240416204604" 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-20240416204604" 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-20240416204604" 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-20240416204604" 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-20240416204604" labels: suite: cryostat test: cryostat-report diff --git a/internal/test/scorecard/common_utils.go b/internal/test/scorecard/common_utils.go index 66c8719d0..e311cd42b 100644 --- a/internal/test/scorecard/common_utils.go +++ b/internal/test/scorecard/common_utils.go @@ -517,7 +517,8 @@ func (r *TestResources) updateAndWaitTillCryostatAvailable(cr *operatorv1beta1.C ctx := context.Background() err := retry.RetryOnConflict(retry.DefaultRetry, func() error { - cr, err := r.Client.OperatorCRDs().Cryostats(cr.Namespace).Get(ctx, cr.Name) + var err error + 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()) }