From 5687756d813ede6d61cb1be97aeb6093a15e486e Mon Sep 17 00:00:00 2001 From: Victoria Martinez de la Cruz Date: Mon, 29 Apr 2024 15:15:19 +0200 Subject: [PATCH 1/3] Bump actions checkout to v4 Bump actions checkout to v4 since Node.js 16 actions are deprecated. We need to update to Node.js 20, which is included in actions/checkout@v4. Also bumped helm kind-action to v1.10.0. --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd6f9bd..51fdaec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 - name: Install Ansible run: python -m pip install 'ansible <= 2.9' @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 - name: Verify image builds run: docker build --tag infrawatch/smart-gateway-operator:latest --file build/Dockerfile . @@ -40,7 +40,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 - name: Get operator-sdk image 0.19.4 run: curl --output operator-sdk -JL https://github.com/operator-framework/operator-sdk/releases/download/$RELEASE_VERSION/operator-sdk-$RELEASE_VERSION-x86_64-linux-gnu @@ -68,7 +68,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.3 # prepare environment to buld the bundle - name: Get operator-sdk image 0.19.4 @@ -104,7 +104,7 @@ jobs: run: operator-sdk-$RELEASE_VERSION bundle validate --verbose /tmp/bundle - name: Create KinD cluster to execute scorecard tests - uses: helm/kind-action@v1.4.0 + uses: helm/kind-action@v1.10.0 # perform scorecard checks against a KinD cluster - name: Check scorecord validation From dde1677d830646550bd05da55b7d6e742d3eb713 Mon Sep 17 00:00:00 2001 From: "vimartin@redhat.com" Date: Thu, 15 Aug 2024 09:55:21 +0200 Subject: [PATCH 2/3] Update SGO to support OCP 4.16 --- deploy/olm-catalog/smart-gateway-operator/Dockerfile.in | 2 +- .../olm-catalog/smart-gateway-operator/metadata/properties.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/olm-catalog/smart-gateway-operator/Dockerfile.in b/deploy/olm-catalog/smart-gateway-operator/Dockerfile.in index 8b7c7f7..f7018c5 100644 --- a/deploy/olm-catalog/smart-gateway-operator/Dockerfile.in +++ b/deploy/olm-catalog/smart-gateway-operator/Dockerfile.in @@ -13,7 +13,7 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4 LABEL operators.operatorframework.io.metrics.project_layout=ansible LABEL com.redhat.delivery.operator.bundle=true -LABEL com.redhat.openshift.versions="v4.12-v4.14" +LABEL com.redhat.openshift.versions="v4.14-v4.16" LABEL com.redhat.delivery.backport=false LABEL com.redhat.component="smart-gateway-operator-bundle-container" \ diff --git a/deploy/olm-catalog/smart-gateway-operator/metadata/properties.yaml b/deploy/olm-catalog/smart-gateway-operator/metadata/properties.yaml index 7e9df00..2c7b860 100644 --- a/deploy/olm-catalog/smart-gateway-operator/metadata/properties.yaml +++ b/deploy/olm-catalog/smart-gateway-operator/metadata/properties.yaml @@ -1,3 +1,3 @@ properties: - type: olm.maxOpenShiftVersion - value: "4.14" + value: "4.16" From 32ef756eb8ba2baf17dafc59137b9e39b31801be Mon Sep 17 00:00:00 2001 From: "vimartin@redhat.com" Date: Mon, 26 Aug 2024 20:06:02 +0200 Subject: [PATCH 3/3] Use openshift-ansible-operator 4.14 in SGO --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 6b4cc33..e1115fa 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-ansible-operator:4.12 +FROM quay.io/openshift/origin-ansible-operator:4.14 # temporarily switch to root user to adjust image layers USER 0