chore(scorecard): bump Scorecard tag (#1063)

(cherry picked from commit 50f1eb3) # Conflicts: # bundle/manifests/cryostat-operator.clusterserviceversion.yaml # bundle/tests/scorecard/config.yaml # config/scorecard/patches/custom.config.yaml
cryostatio · Feb 26, 2025 · 69b58a1 · 69b58a1
1 parent ec55bc9
commit 69b58a1
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 0 deletions.
diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -23,8 +23,13 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
+<<<<<<< HEAD
     containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
     createdAt: "2025-02-05T19:59:37Z"
+=======
+    containerImage: quay.io/cryostat/cryostat-operator:4.1.0-dev
+    createdAt: "2025-02-26T19:38:08Z"
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     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,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - operator-install
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: operator-install
@@ -80,7 +84,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -90,7 +98,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-multi-namespace
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-multi-namespace
@@ -100,7 +112,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -110,7 +126,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -120,7 +140,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     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,11 @@
     entrypoint:
     - cryostat-scorecard-tests
     - operator-install
+<<<<<<< HEAD
     image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
+=======
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258"
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: operator-install
@@ -18,7 +22,11 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
+<<<<<<< HEAD
     image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
+=======
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258"
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -28,7 +36,11 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-multi-namespace
+<<<<<<< HEAD
     image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
+=======
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258"
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-multi-namespace
@@ -38,7 +50,11 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
+<<<<<<< HEAD
     image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
+=======
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258"
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -48,7 +64,11 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
+<<<<<<< HEAD
     image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
+=======
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258"
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -58,7 +78,11 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
+<<<<<<< HEAD
     image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955"
+=======
+    image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250226193258"
+>>>>>>> 50f1eb3 (chore(scorecard): bump Scorecard tag (#1063))
     labels:
       suite: cryostat
       test: cryostat-report