diff --git a/.github/scripts/check_sec-scanner-info.sh b/.github/scripts/check_sec-scanner-config.sh similarity index 91% rename from .github/scripts/check_sec-scanner-info.sh rename to .github/scripts/check_sec-scanner-config.sh index 28a5c8b9..e427401e 100755 --- a/.github/scripts/check_sec-scanner-info.sh +++ b/.github/scripts/check_sec-scanner-config.sh @@ -5,12 +5,11 @@ # Image Tag, rc-tag ############################## - # Get release version DESIRED_TAG="${1:-"main"}" # Get eventing-manager tag from sec-scanners-config.yaml -SEC_SCAN_TO_CHECK="${2:-europe-docker.pkg.dev/kyma-project/prod/eventing-manager}" +SEC_SCAN_TO_CHECK="${2:-europe-docker.pkg.dev/kyma-project/prod/nats-manager}" IMAGE_TAG=$(cat sec-scanners-config.yaml | grep "${SEC_SCAN_TO_CHECK}" | cut -d : -f 2) # Get rc-tag @@ -19,12 +18,12 @@ RC_TAG=$(cat sec-scanners-config.yaml | grep "${RC_TAG_TO_CHECK}" | cut -d : -f # Check IMAGE_TAG and required image tag if [[ "$IMAGE_TAG" != "$DESIRED_TAG" ]] || [[ "$RC_TAG" != "$DESIRED_TAG" ]]; then - # ERROR: Tag issue - echo "Tags are not correct: + # ERROR: Tag issue + echo "Tags are not correct: - wanted: $DESIRED_TAG - security-scanner image tag: $IMAGE_TAG - rc-tag: $RC_TAG" - exit 1 + exit 1 fi # OK: Everything is fine diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index 6068465f..ae406d5a 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -25,7 +25,7 @@ jobs: run: ./.github/scripts/verify_is_on_release_branch.sh - name: Check sec-scanner-config.yaml - run: ./.github/scripts/check_sec-scanner-info.sh + run: ./.github/scripts/check_sec-scanner-config.sh - name: Verify that the tag does not exist run: ./.github/scripts/check_tag_does_not_exist.sh ${{ github.event.inputs.name }} diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 677219d3..f3e7d5ca 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,4 +1,5 @@ module-name: nats +rc-tag: 1.0.2 protecode: - europe-docker.pkg.dev/kyma-project/prod/nats-manager:v20231023-67159afa - europe-docker.pkg.dev/kyma-project/prod/external/natsio/prometheus-nats-exporter:0.13.0