airship/charts
Code Issues Proposed changes

fix(make): updates makefile

Browse Source 
This patch addresses a few issues with the Makefile

- removes redundant directory checks;
- removes requirements.yaml check as helm3 moved that into Charts.yaml;
- fixes so "helm dep up" would work;
- removes loki and harbor from exclusion as they are now actual charts;
- updates the script to use the makefile.

Signed-off-by: Tin Lam <tin@irrational.io>
Change-Id: Ie6133bce4a45dd085569c51abc4c4c3c52b14378
This commit is contained in:
Tin Lam 2021-01-24 12:14:03 -06:00
parent 0cd4381cd1
commit 6a5335b413
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charts/Makefile
View File

@ -16,7 +16,7 @@ TASK := build
EXCLUDES := playbooks roles doc tests tools logs tmp zuul.d releasenotes EXCLUDES := playbooks roles doc tests tools logs tmp zuul.d releasenotes
# NOTE(Portdirect): Exlude chart directories that are presnt only for the purposes of housing over-rides # NOTE(Portdirect): Exlude chart directories that are presnt only for the purposes of housing over-rides
EXCLUDES += harbor loki gerrit ldap EXCLUDES += gerrit ldap
CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
.PHONY: $(EXCLUDES) $(CHARTS) .PHONY: $(EXCLUDES) $(CHARTS)
@ -32,13 +32,13 @@ $(CHARTS):
init-%: init-%:
if [ -f $*/Makefile ]; then make -C $*; fi if [ -f $*/Makefile ]; then make -C $*; fi
if [ -f $*/requirements.yaml ]; then helm dep up $*; fi helm dependency update $*
lint-%: init-% lint-%: init-%
if [ -d $* ]; then helm lint $*; fi helm lint $*
build-%: lint-% build-%: lint-%
if [ -d $* ]; then helm package $*; fi helm package $*
clean: clean:
@echo "Clean all build artifacts" @echo "Clean all build artifacts"

2
charts/harbor/Chart.yaml
View File

@ -1,5 +1,5 @@
apiVersion: v2 apiVersion: v2
name: harbor-utils name: harbor
description: Harbor utility chart description: Harbor utility chart
type: application type: application
version: 0.1.0 version: 0.1.0

4
tools/gate/jarvis/300-deploy-loki.sh
View File

@ -1,9 +1,7 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
cd ./charts/loki make -C ./charts loki
helm dep up
cd -
# shellcheck disable=SC2046 # shellcheck disable=SC2046
helm upgrade \ helm upgrade \

4
tools/gate/jarvis/400-deploy-harbor.sh
View File

@ -1,9 +1,7 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
cd ./charts/harbor make -C ./charts harbor
helm dep up
cd -
# shellcheck disable=SC2046 # shellcheck disable=SC2046
helm upgrade \ helm upgrade \