Release/2.4.0

.github/buildkitd.toml

@@ -0,0 +1,3 @@
+# .github/buildkitd.toml
+[worker.oci]
+  max-parallelism = 4

.github/workflows/branch_build.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -112,7 +112,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -144,51 +144,14 @@ jobs:
         - metering
         - reporter
         - tests
-  base:
-    name: Build Base
-    runs-on: ubuntu-20.04
-    defaults:
-      run:
-        shell: bash
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16.7
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-    - id: buildx
-      name: Set up docker buildx
-      uses: docker/setup-buildx-action@v1
-    - name: Login to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        registry: quay.io/rh-marketplace
-        username: ${{secrets['quayUser']}}
-        password: ${{secrets['quayPassword']}}
-    - id: build
-      name: Build images
-      run: make base/docker-build
-      env:
-        DOCKERBUILDXCACHE: /tmp/.buildx-cache
-        PUSH: "false"
-    - id: push
-      name: Push images
-      run: make base/docker-build
-      env:
-        DOCKERBUILDXCACHE: /tmp/.buildx-cache
-        IMAGE_PUSH: "true"
-    continue-on-error: true
   images:
     name: Build Images
     needs:
     - test
-    - base
     runs-on: ubuntu-20.04
     env:
       VERSION: ${{ needs.test.outputs.tag }}
+      GO_VERSION: 1.16.8
     defaults:
       run:
         shell: bash
@@ -198,12 +161,17 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
+      with:
+        image: tonistiigi/binfmt:qemu-v6.1.0
+        platforms: all
     - id: buildx
       name: Set up docker buildx
       uses: docker/setup-buildx-action@v1
+      with:
+        config: .github/buildkitd.toml
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -266,11 +234,13 @@ jobs:
         - authchecker
         - metering
         - reporter
+        - airgap
         include:
         - project: operator
         - project: authchecker
         - project: metering
         - project: reporter
+        - project: airgap
   deploy:
     name: Deploy
     needs:
@@ -295,12 +265,17 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
+      with:
+        image: tonistiigi/binfmt:qemu-v6.1.0
+        platforms: all
     - id: buildx
       name: Set up docker buildx
       uses: docker/setup-buildx-action@v1
+      with:
+        config: .github/buildkitd.toml
     - name: Cache Go modules
       uses: actions/cache@v2
       with:

.github/workflows/build_base.yml

@@ -0,0 +1,56 @@
+# Generated by internal/ci/ci_tool.cue; do not edit
+name: Build Bases
+on:
+  workflow_dispatch: {}
+  schedule:
+  - cron: 0 0 * * *
+jobs:
+  base:
+    name: Build Base
+    runs-on: ubuntu-20.04
+    env:
+      GO_VERSION: 1.16.8
+      IMAGE_REGISTRY: quay.io/rh-marketplace
+    defaults:
+      run:
+        shell: bash
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16.8
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+      with:
+        image: tonistiigi/binfmt:qemu-v6.1.0
+        platforms: all
+    - id: buildx
+      name: Set up docker buildx
+      uses: docker/setup-buildx-action@v1
+      with:
+        config: .github/buildkitd.toml
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        registry: quay.io/rh-marketplace
+        username: ${{secrets['quayUser']}}
+        password: ${{secrets['quayPassword']}}
+    - id: build
+      name: Build images
+      run: make base/${{ matrix.command }}
+      env:
+        DOCKERBUILDXCACHE: /tmp/.buildx-cache
+        PUSH: "false"
+    - id: push
+      name: Push images
+      run: make base/${{ matrix.command }}
+      env:
+        DOCKERBUILDXCACHE: /tmp/.buildx-cache
+        IMAGE_PUSH: "true"
+    strategy:
+      matrix:
+        command:
+        - base
+        - data-service

.github/workflows/publish.yml

@@ -35,7 +35,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -144,110 +144,18 @@ jobs:
       uses: actions/checkout@v2
     - id: mirror
       name: Scan images
-      run: |-
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-operator"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-c93f69b6-cb04-437b-89d6-e5220ce643cd" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-operator:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch amd64)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-operator@$digest\",\"tag\": \"$TAG-amd64\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-metric-state"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-9b9b0dbe-7adc-448e-9385-a556714a09c4" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-metric-state:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch amd64)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-metric-state@$digest\",\"tag\": \"$TAG-amd64\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-reporter"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-faa0f295-e195-4bcc-a3fc-a4b97ada317e" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-reporter:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch amd64)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-reporter@$digest\",\"tag\": \"$TAG-amd64\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-authcheck"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-ffed416e-c18d-4b88-8660-f586a4792785" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-authcheck:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch amd64)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-authcheck@$digest\",\"tag\": \"$TAG-amd64\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-operator"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-c93f69b6-cb04-437b-89d6-e5220ce643cd" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-operator:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch ppc64le)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-operator@$digest\",\"tag\": \"$TAG-ppc64le\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-metric-state"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-9b9b0dbe-7adc-448e-9385-a556714a09c4" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-metric-state:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch ppc64le)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-metric-state@$digest\",\"tag\": \"$TAG-ppc64le\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-reporter"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-faa0f295-e195-4bcc-a3fc-a4b97ada317e" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-reporter:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch ppc64le)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-reporter@$digest\",\"tag\": \"$TAG-ppc64le\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-authcheck"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-ffed416e-c18d-4b88-8660-f586a4792785" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-authcheck:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch ppc64le)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-authcheck@$digest\",\"tag\": \"$TAG-ppc64le\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-operator"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-c93f69b6-cb04-437b-89d6-e5220ce643cd" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-operator:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch s390x)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-operator@$digest\",\"tag\": \"$TAG-s390x\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-metric-state"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-9b9b0dbe-7adc-448e-9385-a556714a09c4" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-metric-state:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch s390x)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-metric-state@$digest\",\"tag\": \"$TAG-s390x\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-reporter"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-faa0f295-e195-4bcc-a3fc-a4b97ada317e" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-reporter:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch s390x)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-reporter@$digest\",\"tag\": \"$TAG-s390x\"}"
-        echo "::endgroup::"
-        echo "::group::Scan quay.io/rh-marketplace/redhat-marketplace-authcheck"
-        id=$(curl -X GET "https://catalog.redhat.com/api/containers/v1/projects/certification/pid/ospid-ffed416e-c18d-4b88-8660-f586a4792785" -H  "accept: application/json" -H  "X-API-KEY: $REDHAT_TOKEN" | jq -r '._id')
-        digest=$(skopeo --override-os=linux inspect docker://quay.io/rh-marketplace/redhat-marketplace-authcheck:$TAG --raw | jq -r '.manifests[] | select(.platform.architecture == $arch) | .digest' --arg arch s390x)
-        curl -X POST "https://catalog.redhat.com/api/containers/v1/projects/certification/id/$id/requests/scans" \
-        --header 'Content-Type: application/json' \
-        --header "X-API-KEY: $REDHAT_TOKEN" \
-        --data-raw "{\"pull_spec\": \"quay.io/rh-marketplace/redhat-marketplace-authcheck@$digest\",\"tag\": \"$TAG-s390x\"}"
-        echo "::endgroup::"
-      shell: bash {0}
+      run: .github/workflows/scripts/scan_images.sh
       env:
         REDHAT_TOKEN: ${{ secrets.redhat_api_key }}
     - uses: peter-evans/create-or-update-comment@v1
       with:
         comment-id: ${{github.event.comment.id}}
         reactions: rocket
+    - if: ${{ failure() }}
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        comment-id: ${{github.event.comment.id}}
+        reactions: "-1"
   publish:
     name: Publish Images
     runs-on: ubuntu-20.04
@@ -278,7 +186,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -394,7 +302,7 @@ jobs:
     - name: Publish Operator Images
       run: |-
         make pc-tool
-        ./bin/partner-connect-tool publish --username $RH_USER --password $RH_PASSWORD  --images https://connect.redhat.com/projects/5e98b6fac77ce6fca8ac859c/images,,$TAG --images https://connect.redhat.com/projects/5e98b6fc32116b90fd024d06/images,,$TAG --images https://connect.redhat.com/projects/5f36ea2f74cc50b8f01a838d/images,,$TAG --images https://connect.redhat.com/projects/5f62b71018e80cdc21edf22f/images,,$TAG --images https://connect.redhat.com/projects/5f68c9457115dbd1183ccab6/images,,$TAG
+        ./bin/partner-connect-tool publish --username $RH_USER --password $RH_PASSWORD  --images https://connect.redhat.com/projects/5e98b6fac77ce6fca8ac859c/images,,$TAG --images https://connect.redhat.com/projects/5e98b6fc32116b90fd024d06/images,,$TAG --images https://connect.redhat.com/projects/5f36ea2f74cc50b8f01a838d/images,,$TAG --images https://connect.redhat.com/projects/5f62b71018e80cdc21edf22f/images,,$TAG --images https://connect.redhat.com/projects/61649f78d3e2f8d3bcfe30d5/images,,$TAG --images https://connect.redhat.com/projects/5f68c9457115dbd1183ccab6/images,,$TAG
       env:
         RH_USER: ${{ secrets['REDHAT_IO_USER'] }}
         RH_PASSWORD: ${{ secrets['REDHAT_IO_PASSWORD'] }}
@@ -403,6 +311,11 @@ jobs:
       with:
         comment-id: ${{github.event.comment.id}}
         reactions: rocket
+    - if: ${{ failure() }}
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        comment-id: ${{github.event.comment.id}}
+        reactions: "-1"
   push-operator:
     name: Push Operator
     runs-on: ubuntu-20.04
@@ -433,7 +346,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -557,6 +470,11 @@ jobs:
       with:
         comment-id: ${{github.event.comment.id}}
         reactions: rocket
+    - if: ${{ failure() }}
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        comment-id: ${{github.event.comment.id}}
+        reactions: "-1"
   publish-operator:
     name: Publish Operator
     runs-on: ubuntu-20.04
@@ -587,7 +505,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.7
+        go-version: 1.16.8
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -712,3 +630,8 @@ jobs:
       with:
         comment-id: ${{github.event.comment.id}}
         reactions: rocket
+    - if: ${{ failure() }}
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        comment-id: ${{github.event.comment.id}}
+        reactions: "-1"