From 4dca0c1ef2db1b07e30366f50747c4caeb41681b Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Mon, 23 Jan 2023 17:33:58 +0300 Subject: [PATCH] [helm] Update repo endpoints (#337) * [helm] Update repo endpoints * [helm] Update repo endpoints * [helm] Update repo endpoints * [helm] Update repo endpoints * [helm] Update repo endpoints --- .github/workflows/lint.yml | 2 +- modules/helm/Makefile.repo | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e3c7714ce..2d030e135 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - uses: cloudposse/build-harness@0.38.0 + - uses: cloudposse/build-harness@1.8.0 with: entrypoint: /usr/bin/make args: readme/lint diff --git a/modules/helm/Makefile.repo b/modules/helm/Makefile.repo index ec0439e20..c2eb5e7cf 100644 --- a/modules/helm/Makefile.repo +++ b/modules/helm/Makefile.repo @@ -4,21 +4,21 @@ HELM_REPO_PREFIX ?= cloudposse REPO_URL?=https://charts.cloudposse.com ifneq ($(TRAVIS_PULL_REQUEST_BRANCH),) - BRANCH=pr-$(TRAVIS_PULL_REQUEST_BRANCH) + BRANCH=pr-$(TRAVIS_PULL_REQUEST_BRANCH) else ifneq ($(TRAVIS_BRANCH),) - BRANCH=$(TRAVIS_BRANCH) + BRANCH=$(TRAVIS_BRANCH) else ifneq ($(TRAVIS_TAG),) - BRANCH=$(TRAVIS_TAG) + BRANCH=$(TRAVIS_TAG) else ifneq ($(wildcard .git),) - BRANCH=$(GIT_BRANCH) + BRANCH=$(GIT_BRANCH) else ifeq ($(DEBUG),true) - $(warning unable to extrapolate current BRANCH) + $(warning unable to extrapolate current BRANCH) endif ifeq ($(BRANCH),master) - CURRENT_REPO_URL?=$(REPO_URL) + CURRENT_REPO_URL?=$(REPO_URL) else - CURRENT_REPO_URL?=https://charts.dev.cloudposse.com/$(BRANCH) + CURRENT_REPO_URL?=https://charts.dev.cloudposse.com/$(BRANCH) endif ## Show repo info @@ -39,10 +39,10 @@ helm/repo/add-current: helm/repo/add-all: @REPO_NAME=kubernetes-charts \ - REPO_ENDPOINT=http://storage.googleapis.com/kubernetes-charts \ + REPO_ENDPOINT=https://charts.helm.sh/stable \ $(SELF) -s --no-print-directory helm/repo/add @REPO_NAME=kubernetes-charts-incubator \ - REPO_ENDPOINT=https://kubernetes-charts-incubator.storage.googleapis.com \ + REPO_ENDPOINT= https://charts.helm.sh/incubator \ $(SELF) -s --no-print-directory helm/repo/add @for repo in $(HELM_REPO_NAMES); do \ if [ -d "$$repo" ]; then \ @@ -83,13 +83,13 @@ helm/repo/deps: $(call assert-set,REPO_NAME) @echo "## Fetching deps for charts in $(shell basename $(CURDIR))" @find $(HELM_REPO_PATH) -maxdepth 1 -mindepth 1 -type d | \ - xargs -n 1 -I '{}' sh -c 'echo && echo "# Updating dependencies for {}" && $(HELM) dependency build --debug {}' + xargs -n 1 -I '{}' sh -c 'echo && echo "# Updating dependencies for {}" && $(HELM) dependency build --debug {}' helm/repo/package: $(call assert-set,REPO_NAME) @echo "## Building packages in $(shell basename $(CURDIR))" @find $(HELM_REPO_PATH) -maxdepth 1 -mindepth 1 -type d | \ - xargs -n 1 -I '{}' sh -c 'echo && echo "# Building package for {}" && $(HELM) package --debug {}' + xargs -n 1 -I '{}' sh -c 'echo && echo "# Building package for {}" && $(HELM) package --debug {}' @mkdir -p $(HELM_PACKAGE_PATH) @find . -maxdepth 1 -mindepth 1 -type f -name '*.tgz' | \ xargs -I '{}' mv {} $(HELM_PACKAGE_PATH) @@ -108,8 +108,7 @@ helm/repo/index: helm/repo/lint: $(call assert-set,REPO_NAME) @echo "## Linting charts $(shell pwd)" - @find $(HELM_REPO_PATH) -maxdepth 1 -mindepth 1 -type d | \ - xargs -n 1 -I'{}' $(HELM) lint {} + @find $(HELM_REPO_PATH) -maxdepth 1 -mindepth 1 -type d | xargs -n 1 -I'{}' $(HELM) lint {} ## Clean helm repo helm/repo/clean: