Merge branch 'master' into v2

mgoltzsche · Mar 5, 2021 · a365669 · a365669
2 parents 9ac6a1b + f55f33f
commit a365669
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -72,6 +72,7 @@ fmt:
 clean:
 	rm -f $(BUILD_DIR)/bin/khelm
 	rm -f $(BUILD_DIR)/bin/khelm-static
+	rm -rf example/localrefref/charts
 	rm -rf example/kpt/linkerd/dep
 
 clean-all: clean

diff --git a/e2e/image-cli-test.sh b/e2e/image-cli-test.sh
@@ -13,20 +13,21 @@ set -ex
 STATUS=0
 
 DIR="$(mktemp -d)"
-docker run --rm -v "$DIR:/out" $IMAGE template cert-manager \
+docker run --rm -u $(id -u):$(id -g) -v "$DIR:/out" $IMAGE template cert-manager \
 	--version 1.0.4 \
 	--repo https://charts.jetstack.io \
-	--output /out/manifest.yaml \
+	--output /out/subdir/manifest.yaml \
 	--debug || STATUS=1
-[ $STATUS -eq 1 ] || [ -f "$DIR/manifest.yaml" ] || (echo 'fail: output not written to file' >&2; false) || STATUS=1
+ls -la $DIR/subdir
+[ $STATUS -eq 1 ] || [ -f "$DIR/subdir/manifest.yaml" ] || (echo 'fail: output not written to file' >&2; false) || STATUS=1
 rm -rf "$DIR"
 
 DIR="$(mktemp -d)"
-docker run --rm -v "$DIR:/out" -v "$(pwd)/namespace:/chart" $IMAGE template ./chart \
-	--output /out/ \
+docker run --rm -u $(id -u):$(id -g) -v "$DIR:/out" -v "$(pwd)/namespace:/chart" $IMAGE template ./chart \
+	--output /out/kdir/ \
 	--debug || STATUS=1
-[ $STATUS -eq 1 ] || [ -f "$DIR/kustomization.yaml" ] || (echo 'fail: kustomization.yaml not written' >&2; false) || STATUS=1
-[ $STATUS -eq 1 ] || [ -f "$DIR/configmap_myconfigb.yaml" ] || (echo 'fail: resource not written' >&2; false) || STATUS=1
+[ $STATUS -eq 1 ] || [ -f "$DIR/kdir/kustomization.yaml" ] || (echo 'fail: kustomization.yaml not written' >&2; false) || STATUS=1
+[ $STATUS -eq 1 ] || [ -f "$DIR/kdir/configmap_myconfigb.yaml" ] || (echo 'fail: resource not written' >&2; false) || STATUS=1
 [ $STATUS -eq 0 ] || ls -la "$DIR" >&2
 rm -rf "$DIR"