Prep for v0.13.1 release (#429)

* Prep for v0.13.1 release Signed-off-by: Josh Dolitsky <[email protected]> * package bad charts during setup Signed-off-by: Josh Dolitsky <[email protected]> * downgrade to helm 3.5.1, fix tests Signed-off-by: Josh Dolitsky <[email protected]>
helm · Mar 12, 2021 · 79bb39c · 79bb39c
1 parent 79d1cbe
commit 79bb39c
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 59 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -14,7 +14,7 @@ jobs:
       - name: setup go environment
         uses: actions/setup-go@v1
         with:
-          go-version: '1.15.7'
+          go-version: '1.16.0'
       - name: download dependencies
         run: make bootstrap
       - name: run unit tests

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       - name: setup go environment
         uses: actions/setup-go@v1
         with:
-          go-version: '1.15.7'
+          go-version: '1.16.0'
       - name: download dependencies
         run: make bootstrap
       - name: run unit tests

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM golang:alpine
 
-ARG version=0.13.0
+ARG version=0.13.1
 
 ARG revision=main
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION ?= 0.13.0
+VERSION ?= 0.13.1
 REVISION := $(shell git rev-parse --short HEAD;)
 
 BINDIR      := $(CURDIR)/bin
@@ -155,8 +155,8 @@ fetch-dist:
 
 # The contents of the .sha256sum file are compatible with tools like
 # shasum. For example, using the following command will verify
-# the file chartmuseum-v0.13.0-darwin-amd64.tar.gz:
-#   shasum -a 256 -c chartmuseum-v0.13.0-darwin-amd64.tar.gz.sha256sum
+# the file chartmuseum-v0.13.1-darwin-amd64.tar.gz:
+#   shasum -a 256 -c chartmuseum-v0.13.1-darwin-amd64.tar.gz.sha256sum
 .PHONY: checksum
 checksum:
 	for f in $$(ls _dist/*.{gz,zip} 2>/dev/null) ; do \

diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ Install binary using [GoFish](https://gofi.sh/):
 ```
 gofish install chartmuseum
 ==> Installing chartmuseum...
-🐠  chartmuseum 0.13.0: installed in 95.431145ms
+🐠  chartmuseum 0.13.1: installed in 95.431145ms
 ```
 
 or you can use the installer script:
@@ -464,7 +464,7 @@ docker run --rm -it \
   -e STORAGE=local \
   -e STORAGE_LOCAL_ROOTDIR=/charts \
   -v $(pwd)/charts:/charts \
-  ghcr.io/helm/chartmuseum:v0.13.0
+  ghcr.io/helm/chartmuseum:v0.13.1
 ```
 
 Example usage (S3):
@@ -477,7 +477,7 @@ docker run --rm -it \
   -e STORAGE_AMAZON_PREFIX="" \
   -e STORAGE_AMAZON_REGION="us-east-1" \
   -v ~/.aws:/home/chartmuseum/.aws:ro \
-  ghcr.io/helm/chartmuseum:v0.13.0
+  ghcr.io/helm/chartmuseum:v0.13.1
 ```
 
 ### Helm Chart

diff --git a/acceptance_tests/lib/ChartMuseum.py b/acceptance_tests/lib/ChartMuseum.py
@@ -18,7 +18,7 @@ def http_status_code_should_be(self, expected_status, actual_status):
     def start_chartmuseum(self, storage):
         self.stop_chartmuseum()
         os.chdir(self.rootdir)
-        cmd = 'KILLME=1 chartmuseum --debug --port=%d --storage="%s" ' % (common.PORT, storage)
+        cmd = 'KILLME=1 chartmuseum --debug --enforce-semver2 --port=%d --storage="%s" ' % (common.PORT, storage)
         if storage == 'local':
             shutil.rmtree(common.STORAGE_DIR, ignore_errors=True)
             cmd += '--storage-local-rootdir=%s >> %s 2>&1' % (common.STORAGE_DIR, common.LOGFILE)

diff --git a/go.mod b/go.mod
@@ -1,9 +1,11 @@
 module helm.sh/chartmuseum
 
-go 1.15
+go 1.16
 
 replace (
 	github.com/NetEase-Object-Storage/nos-golang-sdk => github.com/karuppiah7890/nos-golang-sdk v0.0.0-20191116042345-0792ba35abcc
+	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
 	go.etcd.io/etcd => github.com/eddycjy/etcd v0.5.0-alpha.5.0.20200218102753-4258cdd2efdf
 	google.golang.org/grpc => google.golang.org/grpc v1.29.1
 )
@@ -13,13 +15,13 @@ require (
 	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
 	github.com/alicebob/miniredis v2.5.0+incompatible
 	github.com/chartmuseum/auth v0.4.5
-	github.com/chartmuseum/storage v0.10.4
+	github.com/chartmuseum/storage v0.10.5
 	github.com/ghodss/yaml v1.0.0
 	github.com/gin-contrib/size v0.0.0-20200916080119-37b334d93b20
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/gofrs/uuid v4.0.0+incompatible
-	github.com/gomodule/redigo v1.8.3 // indirect
+	github.com/gomodule/redigo v1.8.4 // indirect
 	github.com/prometheus/client_golang v1.9.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/viper v1.7.1
@@ -29,5 +31,4 @@ require (
 	github.com/zsais/go-gin-prometheus v0.1.0
 	go.uber.org/zap v1.16.0
 	helm.sh/helm/v3 v3.5.1
-	rsc.io/letsencrypt v0.0.3 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/pkg/chartmuseum/server/multitenant/server_test.go b/pkg/chartmuseum/server/multitenant/server_test.go
@@ -49,7 +49,7 @@ var otherTestTarballPath = "../../../../testdata/charts/otherchart/otherchart-0.
 var otherTestProvfilePath = "../../../../testdata/charts/otherchart/otherchart-0.1.0.tgz.prov"
 var badTestTarballPath = "../../../../testdata/badcharts/mybadchart/mybadchart-1.0.0.tgz"
 var badTestProvfilePath = "../../../../testdata/badcharts/mybadchart/mybadchart-1.0.0.tgz.prov"
-var badTestSemver2Path = "../../../../testdata/charts/mybadsemver2chart/mybadsemver2chart-0.x.x.tgz"
+var badTestSemver2Path = "../../../../testdata/badcharts/mybadsemver2chart/mybadsemver2chart-0.x.x.tgz"
 
 type MultiTenantServerTestSuite struct {
 	suite.Suite

diff --git a/scripts/setup-test-environment.sh b/scripts/setup-test-environment.sh
@@ -45,6 +45,17 @@ package_test_charts() {
     # add another version to repo for metric tests
     helm package --sign --key helm-test --keyring ../pgp/helm-test-key.secret --version 0.2.0 -d mychart/ mychart/.
     popd
+
+    pushd testdata/badcharts/
+    for d in $(find . -maxdepth 1 -mindepth 1 -type d); do
+        pushd $d
+        # TODO: remove in v0.14.0. We do not generate .prov file for this chart
+        # since prov validation is not enabled, and it breaks acceptance tests
+        if grep "mybadsemver2chart" Chart.yaml; then
+            helm package . || true
+        fi
+        popd
+    done
 }
 
 main
diff --git a/...data/charts/mybadsemver2chart/.helmignore → ...a/badcharts/mybadsemver2chart/.helmignore b/...data/charts/mybadsemver2chart/.helmignore → ...a/badcharts/mybadsemver2chart/.helmignore
diff --git a/testdata/charts/mybadsemver2chart/Chart.yaml → ...ta/badcharts/mybadsemver2chart/Chart.yaml b/testdata/charts/mybadsemver2chart/Chart.yaml → ...ta/badcharts/mybadsemver2chart/Chart.yaml
diff --git a/...arts/mybadsemver2chart/templates/pod.yaml → ...arts/mybadsemver2chart/templates/pod.yaml b/...arts/mybadsemver2chart/templates/pod.yaml → ...arts/mybadsemver2chart/templates/pod.yaml