From ce85891e7d9584e7b73b89d2f6310054182d3794 Mon Sep 17 00:00:00 2001 From: Giles Hutton Date: Mon, 10 Feb 2025 09:11:53 +0000 Subject: [PATCH 1/4] Bump Collector version to 3.21.0 --- COLLECTOR_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COLLECTOR_VERSION b/COLLECTOR_VERSION index dbaeefe72736b..6075c9a9ff915 100644 --- a/COLLECTOR_VERSION +++ b/COLLECTOR_VERSION @@ -1 +1 @@ -3.20.x-82-gfe283d9f29 +3.21.0 From 94f1c5cafbdbc3738595b79f7d81b3f06431f58c Mon Sep 17 00:00:00 2001 From: Giles Hutton Date: Tue, 11 Feb 2025 09:30:00 +0000 Subject: [PATCH 2/4] Remove slim references from github workflows --- .github/workflows/build.yaml | 4 ++-- .github/workflows/check-image-vulnerabilities.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 319bd3588b6dc..ce0f0b297e9d8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -60,7 +60,7 @@ jobs: matrix="$(jq '.build_and_push_operator.name += ["RHACS_BRANDING"]' <<< "$matrix")" matrix="$(jq '.scan_images_with_roxctl.name += ["RHACS_BRANDING", "STACKROX_BRANDING"]' <<< "$matrix")" - matrix="$(jq '.scan_images_with_roxctl.image += ["central-db", "collector", "collector-slim", "main", "roxctl", "scanner", "scanner-db", "scanner-db-slim", "scanner-slim", "stackrox-operator"]' <<< "$matrix")" + matrix="$(jq '.scan_images_with_roxctl.image += ["central-db", "collector", "main", "roxctl", "scanner", "scanner-db", "scanner-db-slim", "scanner-slim", "stackrox-operator"]' <<< "$matrix")" # TODO(ROX-27191): remove the exclusion once there's a community operator. matrix="$(jq '.scan_images_with_roxctl.exclude += [{ "name": "STACKROX_BRANDING", "image": "stackrox-operator" }]' <<< "$matrix")" @@ -282,7 +282,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tag_suffix: ["", "-fast", "-fast-slim"] + tag_suffix: ["", "-fast"] steps: - name: Checkout repo uses: actions/checkout@v4 diff --git a/.github/workflows/check-image-vulnerabilities.yml b/.github/workflows/check-image-vulnerabilities.yml index dd7803d916bb4..4e2819f50e525 100644 --- a/.github/workflows/check-image-vulnerabilities.yml +++ b/.github/workflows/check-image-vulnerabilities.yml @@ -38,7 +38,6 @@ jobs: [ "central-db", "collector", - "collector-slim", "main", "roxctl", "scanner", From 5fd12f2b604eac98eb340190655c336c909708be Mon Sep 17 00:00:00 2001 From: Giles Hutton Date: Tue, 11 Feb 2025 10:00:22 +0000 Subject: [PATCH 3/4] Remove collector-slim retag --- scripts/ci/lib.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/ci/lib.sh b/scripts/ci/lib.sh index 2379359da2f4c..3746ef121b097 100755 --- a/scripts/ci/lib.sh +++ b/scripts/ci/lib.sh @@ -247,7 +247,7 @@ push_image_manifest_lists() { done # Push manifest lists for scanner and collector for amd64 only - local amd64_image_set=("scanner" "scanner-db" "scanner-slim" "scanner-db-slim" "collector" "collector-slim") + local amd64_image_set=("scanner" "scanner-db" "scanner-slim" "scanner-db-slim" "collector" ) for image in "${amd64_image_set[@]}"; do retry 5 true \ "$SCRIPTS_ROOT/scripts/ci/push-as-multiarch-manifest-list.sh" "${registry}/${image}:${tag}" "amd64" | cat @@ -461,7 +461,6 @@ push_matching_collector_scanner_images() { _retag "${registry}/scanner-db-slim:${scanner_version}" "${registry}/scanner-db-slim:${main_tag}-${arch}" _retag "${registry}/collector:${collector_version}" "${registry}/collector:${main_tag}-${arch}" - _retag "${registry}/collector:${collector_version}-slim" "${registry}/collector-slim:${main_tag}-${arch}" } poll_for_system_test_images() { @@ -814,7 +813,6 @@ stackrox-operator-index ${operator_metadata_tag} main ${tag} central-db ${tag} collector ${tag} -collector-slim ${tag} scanner ${tag} scanner-db ${tag} scanner-v4 ${tag} From a0240db21bfbbbf604c55cae3924261a8dddb8e3 Mon Sep 17 00:00:00 2001 From: Giles Hutton Date: Tue, 11 Feb 2025 11:28:37 +0000 Subject: [PATCH 4/4] Fix whitespace in amd64_image_set Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com> --- scripts/ci/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/lib.sh b/scripts/ci/lib.sh index 3746ef121b097..a85cc4102acea 100755 --- a/scripts/ci/lib.sh +++ b/scripts/ci/lib.sh @@ -247,7 +247,7 @@ push_image_manifest_lists() { done # Push manifest lists for scanner and collector for amd64 only - local amd64_image_set=("scanner" "scanner-db" "scanner-slim" "scanner-db-slim" "collector" ) + local amd64_image_set=("scanner" "scanner-db" "scanner-slim" "scanner-db-slim" "collector") for image in "${amd64_image_set[@]}"; do retry 5 true \ "$SCRIPTS_ROOT/scripts/ci/push-as-multiarch-manifest-list.sh" "${registry}/${image}:${tag}" "amd64" | cat