Skip to content

Commit

Permalink
[ci] Update tools (#79)
Browse files Browse the repository at this point in the history
Signed-off-by: Reinhard Naegele <[email protected]>
  • Loading branch information
unguiculus authored Jul 22, 2019
1 parent eec15ff commit 7bfc1a5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .circleci/install_charts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ set -o nounset
set -o pipefail

readonly CT_VERSION=v2.3.3
readonly KIND_VERSION=0.2.1
readonly KIND_VERSION=v0.4.0
readonly CLUSTER_NAME=chart-testing
readonly K8S_VERSION=v1.14.0
readonly K8S_VERSION=v1.15.0

run_ct_container() {
echo 'Running ct container...'
Expand Down
12 changes: 6 additions & 6 deletions .circleci/install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -o errexit

readonly HELM_VERSION=2.13.1
readonly CHART_RELEASER_VERSION=0.1.4
readonly HELM_VERSION=2.14.2
readonly CHART_RELEASER_VERSION=0.2.1

echo "Installing Helm..."
curl -LO "https://kubernetes-helm.storage.googleapis.com/helm-v$HELM_VERSION-linux-amd64.tar.gz"
Expand All @@ -14,8 +14,8 @@ rm -f "helm-v$HELM_VERSION-linux-amd64.tar.gz"
helm init --client-only

echo "Installing chart-releaser..."
curl -LO "https://github.com/helm/chart-releaser/releases/download/v${CHART_RELEASER_VERSION}/chart-releaser_${CHART_RELEASER_VERSION}_Linux_x86_64.tar.gz"
curl -LO "https://github.com/helm/chart-releaser/releases/download/v${CHART_RELEASER_VERSION}/chart-releaser_${CHART_RELEASER_VERSION}_linux_amd64.tar.gz"
sudo mkdir -p "/usr/local/chart-releaser-v$CHART_RELEASER_VERSION"
sudo tar -xzf "chart-releaser_${CHART_RELEASER_VERSION}_Linux_x86_64.tar.gz" -C "/usr/local/chart-releaser-v$CHART_RELEASER_VERSION"
sudo ln -s "/usr/local/chart-releaser-v$CHART_RELEASER_VERSION/chart-releaser" /usr/local/bin/chart-releaser
rm -f "chart-releaser_${CHART_RELEASER_VERSION}_Linux_x86_64.tar.gz"
sudo tar -xzf "chart-releaser_${CHART_RELEASER_VERSION}_linux_amd64.tar.gz" -C "/usr/local/chart-releaser-v$CHART_RELEASER_VERSION"
sudo ln -s "/usr/local/chart-releaser-v$CHART_RELEASER_VERSION/cr" /usr/local/bin/cr
rm -f "chart-releaser_${CHART_RELEASER_VERSION}_linux_amd64.tar.gz"
17 changes: 10 additions & 7 deletions .circleci/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -o errexit
set -o nounset
set -o pipefail

: "${CH_TOKEN:?Environment variable CH_TOKEN must be set}"
: "${CR_TOKEN:?Environment variable CR_TOKEN must be set}"
: "${GIT_REPOSITORY_URL:?Environment variable GIT_REPO_URL must be set}"
: "${GIT_USERNAME:?Environment variable GIT_USERNAME must be set}"
: "${GIT_EMAIL:?Environment variable GIT_EMAIL must be set}"
Expand Down Expand Up @@ -33,8 +33,11 @@ main() {
exit
fi

rm -rf .deploy
mkdir -p .deploy
rm -rf .cr-release-packages
mkdir -p .cr-release-packages

rm -rf .cr-index
mkdir -p .cr-index

echo "Identifying changed charts since tag '$latest_tag'..."

Expand Down Expand Up @@ -65,21 +68,21 @@ find_latest_tag() {
package_chart() {
local chart="$1"
helm dependency build "$chart"
helm package "$chart" --destination .deploy
helm package "$chart" --destination .cr-release-packages
}

release_charts() {
chart-releaser upload -o codecentric -r helm-charts -p .deploy
cr upload -o codecentric -r helm-charts
}

update_index() {
chart-releaser index -o codecentric -r helm-charts -p .deploy/index.yaml
cr index -o codecentric -r helm-charts

git config user.email "$GIT_EMAIL"
git config user.name "$GIT_USERNAME"

git checkout gh-pages
cp --force .deploy/index.yaml index.yaml
cp --force .cr-index/index.yaml index.yaml
git add index.yaml
git commit --message="Update index.yaml" --signoff
git push "$GIT_REPOSITORY_URL" gh-pages
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
.deploy
venv
charts/**/charts
.cr-*

1 comment on commit 7bfc1a5

@swistaczek
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure but I think cr is only capable of releasing single chart so that's may be the reason why we see only jenkins in gh-pages charts.

Please sign in to comment.