sync: main to rhdp-deploy

.github/dependabot.yml

@@ -7,3 +7,9 @@ updates:
     schedule:
       interval: "weekly"
 
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+    cooldown:
+      default-days: 7

.github/workflows/superlinter.yml

@@ -1,6 +1,7 @@
 ---
 name: Super linter
 
+permissions: read-all # zizmor: ignore[excessive-permissions]
 on: [push, pull_request]
 
 jobs:
@@ -12,16 +13,17 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
+          persist-credentials: false
           # Full git history is needed to get a proper list of changed files within `super-linter`
           fetch-depth: 0
 
       ################################
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
-        uses: super-linter/super-linter/slim@v7
+        uses: super-linter/super-linter/slim@61abc07d755095a68f4987d1c2c3d1d64408f1f9 # v8.5.0
         env:
           VALIDATE_ALL_CODEBASE: true
           DEFAULT_BRANCH: main
@@ -41,5 +43,12 @@ jobs:
           VALIDATE_TEKTON: false
           VALIDATE_YAML: false
           VALIDATE_YAML_PRETTIER: false
-          # VALIDATE_MARKDOWN: false
-          # VALIDATE_NATURAL_LANGUAGE: false
+          VALIDATE_BIOME_FORMAT: false
+          VALIDATE_BIOME_LINT: false
+          VALIDATE_NATURAL_LANGUAGE: false
+          VALIDATE_SPELL_CODESPELL: false
+          VALIDATE_PYTHON_BLACK: false
+          VALIDATE_PYTHON_PYINK: false
+          VALIDATE_PYTHON_RUFF_FORMAT: false
+          VALIDATE_TRIVY: false
+          FILTER_REGEX_EXCLUDE: .*/common/.*

.github/workflows/sync-rhdp-branch.yml

@@ -13,16 +13,21 @@ jobs:
       github.repository_owner == 'validatedpatterns'
     runs-on: ubuntu-latest
     name: Git Sync branch
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: 20
       - name: Opening pull request
         id: pull
-        uses: mbaldessari/git-sync-branch@v0.2.0
+        uses: mbaldessari/git-sync-branch@dd2adf0ca96e52c64716d83cabe85fac33201e12 # v0.2.0
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           FROM_BRANCH: "main"

.github/workflows/update-metadata.yml

@@ -1,6 +1,6 @@
 # This job requires a secret called DOCS_TOKEN which should be a PAT token
 # that has the permissions described in:
-# validatedpatterns/docs/.github/workflows/metadata-docs.yml@main
+# validatedpatterns/docs/.github/workflows/metadata-docs.yml@main # zizmor: ignore[unpinned-uses]
 ---
 name: Update docs pattern metadata
 
@@ -14,12 +14,12 @@ on:
 
 jobs:
   update-metadata:
-    uses: validatedpatterns/docs/.github/workflows/metadata-docs.yml@main
+    uses: validatedpatterns/docs/.github/workflows/metadata-docs.yml@main # zizmor: ignore[unpinned-uses]
     permissions: # Workflow-level permissions
       contents: read  # Required for "read-all"
       packages: write # Allows writing to packages
       id-token: write # Allows creating OpenID Connect (OIDC) tokens
-    secrets: inherit
+    secrets: inherit # zizmor: ignore[secrets-inherit]
     # For testing you can point to a different branch in the docs repository
     # with:
     #  DOCS_BRANCH: "main"

charts/datacenter/pipelines/images/bumpversiontask/README.md

@@ -1,4 +1,4 @@
 # bumpversiontask
 
 Create a container image that can be used as Tekton task to bump a version using bump2version.
-Image is build using quay, you can find the consumable image [here](https://quay.io/repository/hybridcloudpatterns/bumpversiontask?tab=tags)
+Image is build using quay, you can find the consumable image [in this quay repository](https://quay.io/repository/hybridcloudpatterns/bumpversiontask?tab=tags)

tests/interop/test_subscription_status_hub.py

@@ -12,46 +12,12 @@
 def test_subscription_status_hub(openshift_dyn_client):
     openshift_ver = subscription.openshift_version(openshift_dyn_client)
     openshift_ver = openshift_ver.instance.status.history[0].version
+    ver = ".".join(openshift_ver.split(".")[:2])
 
-    # These are the operator subscriptions and their associated namespaces
-    if "4.19." in openshift_ver or "4.20." in openshift_ver:
-        expected_subs = {
-            "openshift-gitops-operator": ["openshift-operators"],
-            "advanced-cluster-management": ["open-cluster-management"],
-            "openshift-pipelines-operator-rh": ["openshift-operators"],
-            "amq-broker-rhel8": ["manuela-tst-all"],
-            "amq-streams": ["manuela-tst-all", "manuela-data-lake"],
-            "camel-k": ["manuela-tst-all", "manuela-data-lake"],
-            "rhods-operator": ["redhat-ods-operator"],
-            "odf-operator": ["openshift-storage"],
-            "odf-dependencies": ["openshift-storage"],
-            "odf-prometheus-operator-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "odf-csi-addons-operator-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "mcg-operator-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "ocs-operator-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "ocs-client-operator-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "cephcsi-operator-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "recipe-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "rook-ceph-operator-stable-4.19-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-        }
+    logger.info(f"Openshift major/minor version: {ver}")
 
-    elif "4.18." in openshift_ver:
+    # These are the operator subscriptions and their associated namespaces
+    if ver == "4.18" or ver == "4.20" or ver == "4.21":
         expected_subs = {
             "openshift-gitops-operator": ["openshift-operators"],
             "advanced-cluster-management": ["open-cluster-management"],
@@ -62,103 +28,34 @@ def test_subscription_status_hub(openshift_dyn_client):
             "rhods-operator": ["redhat-ods-operator"],
             "odf-operator": ["openshift-storage"],
             "odf-dependencies": ["openshift-storage"],
-            "odf-prometheus-operator-stable-4.18-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "odf-csi-addons-operator-stable-4.18-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "mcg-operator-stable-4.18-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "ocs-operator-stable-4.18-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "ocs-client-operator-stable-4.18-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "cephcsi-operator-stable-4.18-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "recipe-stable-4.18-redhat-operators-openshift-marketplace": [
+            f"odf-prometheus-operator-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
-            "rook-ceph-operator-stable-4.18-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-        }
-
-    elif "4.17." in openshift_ver:
-        expected_subs = {
-            "openshift-gitops-operator": ["openshift-operators"],
-            "advanced-cluster-management": ["open-cluster-management"],
-            "openshift-pipelines-operator-rh": ["openshift-operators"],
-            "amq-broker-rhel8": ["manuela-tst-all"],
-            "amq-streams": ["manuela-tst-all", "manuela-data-lake"],
-            "camel-k": ["manuela-tst-all", "manuela-data-lake"],
-            "rhods-operator": ["redhat-ods-operator"],
-            "odf-operator": ["openshift-storage"],
-            "odf-prometheus-operator-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "odf-csi-addons-operator-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "mcg-operator-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "ocs-operator-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "ocs-client-operator-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "cephcsi-operator-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "recipe-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-            "rook-ceph-operator-stable-4.17-redhat-operators-openshift-marketplace": [
-                "openshift-storage"
-            ],
-        }
-
-    elif "4.16." in openshift_ver:
-        expected_subs = {
-            "openshift-gitops-operator": ["openshift-operators"],
-            "advanced-cluster-management": ["open-cluster-management"],
-            "openshift-pipelines-operator-rh": ["openshift-operators"],
-            "amq-broker-rhel8": ["manuela-tst-all"],
-            "amq-streams": ["manuela-tst-all", "manuela-data-lake"],
-            "camel-k": ["manuela-tst-all", "manuela-data-lake"],
-            "rhods-operator": ["redhat-ods-operator"],
-            "odf-operator": ["openshift-storage"],
-            "odf-prometheus-operator-stable-4.16-redhat-operators-openshift-marketplace": [
+            f"odf-csi-addons-operator-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
-            "odf-csi-addons-operator-stable-4.16-redhat-operators-openshift-marketplace": [
+            f"mcg-operator-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
-            "mcg-operator-stable-4.16-redhat-operators-openshift-marketplace": [
+            f"ocs-operator-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
-            "ocs-operator-stable-4.16-redhat-operators-openshift-marketplace": [
+            f"ocs-client-operator-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
-            "ocs-client-operator-stable-4.16-redhat-operators-openshift-marketplace": [
+            f"cephcsi-operator-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
-            "recipe-stable-4.16-redhat-operators-openshift-marketplace": [
+            f"recipe-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
-            "rook-ceph-operator-stable-4.16-redhat-operators-openshift-marketplace": [
+            f"rook-ceph-operator-stable-{ver}-redhat-operators-openshift-marketplace": [
                 "openshift-storage"
             ],
         }
 
     else:
-        err_msg = f"Openshift version {openshift_ver} not supported"
+        err_msg = f"Openshift version {ver} not supported"
         logger.error(f"FAIL: {err_msg}")
         assert False, err_msg