Skip to content

Commit

Permalink
[Release 1.2.0] Update VERSION and security scanner config (#490)
Browse files Browse the repository at this point in the history
* Update VERSION

* Update sec-scanners-config.yaml

* Use latest if minor doesn't match the branch
  • Loading branch information
barchw authored Nov 27, 2023
1 parent 2b49dc6 commit 2721846
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2
1.2.0
8 changes: 4 additions & 4 deletions sec-scanners-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module-name: istio
protecode:
- europe-docker.pkg.dev/kyma-project/prod/istio-manager:v20231117-6e5af098
- europe-docker.pkg.dev/kyma-project/prod/external/istio/install-cni:1.19.3-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/proxyv2:1.19.3-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/pilot:1.19.3-distroless
- europe-docker.pkg.dev/kyma-project/prod/istio-manager:1.2.0
- europe-docker.pkg.dev/kyma-project/prod/external/istio/install-cni:1.20.0-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/proxyv2:1.20.0-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/pilot:1.20.0-distroless
whitesource:
language: golang-mod
subprojects: false
Expand Down
11 changes: 6 additions & 5 deletions tests/integration/scripts/deploy-latest-release-to-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ set -o pipefail

TARGET_BRANCH="$1"

# The if statement is here to make the script work properly on release branches
# Example: if we want to patch 0.2.0 to 0.2.1 when already 0.3.0 exists it makes
# the script deploy 0.2.0 instead 0.3.0 so we don't test upgrade from 0.3.0 to 0.2.1
if [ "$TARGET_BRANCH" != "main" ] && [ "$TARGET_BRANCH" != "" ]
# If the first tag in branch history doesn't match release tag minor (or target is main)
# install istio from the latest release instead
TAG=$(git describe --tags --abbrev=0)
if [ "${TAG%.*}" == "${TARGET_BRANCH#release\-}" ]
then
TAG=$(git describe --tags --abbrev=0)
echo "Installing Istio ${TAG}"
RELEASE_MANIFEST_URL="https://github.com/kyma-project/istio/releases/download/${TAG}/istio-manager.yaml"
curl -L "$RELEASE_MANIFEST_URL" | kubectl apply -f -
else
echo "Installing Istio from latest release"
RELEASE_MANIFEST_URL="https://github.com/kyma-project/istio/releases/latest/download/istio-manager.yaml"
curl -L "$RELEASE_MANIFEST_URL" | kubectl apply -f -
fi

0 comments on commit 2721846

Please sign in to comment.