From 38c53a1741b46dde5e63dad7f9b655ddb3d6382d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 23:26:15 +0000 Subject: [PATCH] fix(deps): update github.com/cilium/charts digest to 64e4ab4 Signed-off-by: renovate[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/cilium/charts/generate_readme.sh | 9 ++++++++- .../cilium/charts/prepare_tetragon_artifacts.sh | 10 +++++++++- vendor/modules.txt | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index e2df831cdb..bcdcbbc040 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( require ( github.com/blang/semver/v4 v4.0.0 - github.com/cilium/charts v0.0.0-20231204144821-3de0b7aec8d6 + github.com/cilium/charts v0.0.0-20231209073633-64e4ab472dbc github.com/cilium/cilium v1.15.0-pre.3 github.com/cilium/hubble v0.12.2 github.com/cilium/tetragon/pkg/k8s v0.0.0-20231127174521-c97da4b42413 diff --git a/go.sum b/go.sum index 343c463cdd..fe76bd4b06 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHe github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/charts v0.0.0-20231204144821-3de0b7aec8d6 h1:ocaslAYkxFm230QXCT5+H5ZyN0Rqw43MHtC6mgCMisg= -github.com/cilium/charts v0.0.0-20231204144821-3de0b7aec8d6/go.mod h1:M3C9VOlFvRzuV+a01t07Tw4uFLSfkCH3L542IWjf6BU= +github.com/cilium/charts v0.0.0-20231209073633-64e4ab472dbc h1:QhiqRsJlsyKihOMFREng4CEsR8gkZ3hx5g/QmWDkf6Q= +github.com/cilium/charts v0.0.0-20231209073633-64e4ab472dbc/go.mod h1:M3C9VOlFvRzuV+a01t07Tw4uFLSfkCH3L542IWjf6BU= github.com/cilium/checkmate v1.0.3 h1:CQC5eOmlAZeEjPrVZY3ZwEBH64lHlx9mXYdUehEwI5w= github.com/cilium/checkmate v1.0.3/go.mod h1:KiBTasf39/F2hf2yAmHw21YFl3hcEyP4Yk6filxc12A= github.com/cilium/cilium v1.15.0-pre.3 h1:HuARlBUHQxXaLp1JoCYIv/2iwKZPxcIuQ3TWtjPWKpk= diff --git a/vendor/github.com/cilium/charts/generate_readme.sh b/vendor/github.com/cilium/charts/generate_readme.sh index a4290ed094..8156848d29 100644 --- a/vendor/github.com/cilium/charts/generate_readme.sh +++ b/vendor/github.com/cilium/charts/generate_readme.sh @@ -30,7 +30,14 @@ for version in \ | sed '/-/!{s/$/_/}' \ | sort -Vr \ | sed 's/_$//'); do - echo "* [v$version](https://github.com/cilium/tetragon/releases/tag/v$version) (_[source](https://github.com/cilium/tetragon/tree/v$version/install/kubernetes)_)" + # Tetragon chart was moved in 1.1 release + TETRAGON_CHART_DIR="install/kubernetes/tetragon" + MAJOR=$(echo "$version" | cut -d. -f1) + MINOR=$(echo "$version" | cut -d. -f2) + if [ "$MAJOR" -lt 1 ] || ([ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 1 ]); then + TETRAGON_CHART_DIR="install/kubernetes" + fi + echo "* [v$version](https://github.com/cilium/tetragon/releases/tag/v$version) (_[source](https://github.com/cilium/tetragon/tree/v$version/$TETRAGON_CHART_DIR)_)" done cat << EOF diff --git a/vendor/github.com/cilium/charts/prepare_tetragon_artifacts.sh b/vendor/github.com/cilium/charts/prepare_tetragon_artifacts.sh index a504eaca80..156ecd2915 100644 --- a/vendor/github.com/cilium/charts/prepare_tetragon_artifacts.sh +++ b/vendor/github.com/cilium/charts/prepare_tetragon_artifacts.sh @@ -19,11 +19,19 @@ if [ -f "tetragon-${VERSION}.tgz" ]; then exit 0 fi +# Tetragon chart was moved in 1.1 release +TETRAGON_CHART_DIR="install/kubernetes/tetragon" +MAJOR=$(echo "$VERSION" | cut -d. -f1) +MINOR=$(echo "$VERSION" | cut -d. -f2) +if [ "$MAJOR" -lt 1 ] || ([ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 1 ]); then + TETRAGON_CHART_DIR="install/kubernetes" +fi + echo "Generating tetragon package from tag: $TAG" rm -rf tetragon git clone git@github.com:cilium/tetragon.git git_checkout_ref "$(pwd)/tetragon" "$TAG" -helm package -d . tetragon/install/kubernetes --version="${VERSION}" --app-version="${VERSION}" +helm package -d . "tetragon/$TETRAGON_CHART_DIR" --version="${VERSION}" --app-version="${VERSION}" helm repo index . --merge index.yaml ./generate_readme.sh > README.md git add README.md index.yaml tetragon-"$VERSION".tgz diff --git a/vendor/modules.txt b/vendor/modules.txt index f87751b66e..1645d979c2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -52,7 +52,7 @@ github.com/chai2010/gettext-go github.com/chai2010/gettext-go/mo github.com/chai2010/gettext-go/plural github.com/chai2010/gettext-go/po -# github.com/cilium/charts v0.0.0-20231204144821-3de0b7aec8d6 +# github.com/cilium/charts v0.0.0-20231209073633-64e4ab472dbc ## explicit; go 1.17 github.com/cilium/charts # github.com/cilium/cilium v1.15.0-pre.3