Skip to content

Commit

Permalink
Merge pull request #125 from hypnoglow/update-helm-versions
Browse files Browse the repository at this point in the history 
Update Go, supported Helm versions
  • Loading branch information
@hypnoglow
hypnoglow authored Oct 26, 2020
2 parents 58cdc7d + 0728a8e commit 5312896
Show file tree
Hide file tree
Showing 4 changed files with 626 additions and 231 deletions.
114 changes: 55 additions & 59 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ commands:
# Add `stable` repo only for helm v3
if [ "${IT_HELM_VERSION:0:1}" == "3" ]; then
helm repo add stable https://kubernetes-charts.storage.googleapis.com/
helm repo add stable https://charts.helm.sh/stable
fi
- run:
name: Build and install the plugin
Expand Down Expand Up @@ -105,7 +105,7 @@ commands:
jobs:
dep:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.15
environment:
GO111MODULE: "on"
working_directory: /go/src/github.com/hypnoglow/helm-s3
Expand All @@ -118,7 +118,7 @@ jobs:
- helm-s3
test-unit:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.15
environment:
GO111MODULE: "on"
GOFLAGS: "-mod=vendor"
Expand All @@ -128,9 +128,9 @@ jobs:
at: /go/src/github.com/hypnoglow
- run: ./.circleci/testcover.sh
- run: bash <(curl -s https://codecov.io/bash)
test-integration-helm-2_14:
test-integration-helm-2_16:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.15
environment:
GO111MODULE: "on"
GOFLAGS: "-mod=vendor"
Expand All @@ -150,10 +150,10 @@ jobs:
- attach_workspace:
at: /go/src/github.com/hypnoglow
- run_integration_tests:
helm_version: 2.14.3
test-integration-helm-2_15:
helm_version: 2.16.12
test-integration-helm-2_17:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.15
environment:
GO111MODULE: "on"
GOFLAGS: "-mod=vendor"
Expand All @@ -173,10 +173,10 @@ jobs:
- attach_workspace:
at: /go/src/github.com/hypnoglow
- run_integration_tests:
helm_version: 2.15.2
test-integration-helm-2_16:
helm_version: 2.17.0
test-integration-helm-3_3:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.15
environment:
GO111MODULE: "on"
GOFLAGS: "-mod=vendor"
Expand All @@ -196,10 +196,10 @@ jobs:
- attach_workspace:
at: /go/src/github.com/hypnoglow
- run_integration_tests:
helm_version: 2.16.1
test-integration-helm-3_0:
helm_version: 3.3.4
test-integration-helm-3_4:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.15
environment:
GO111MODULE: "on"
GOFLAGS: "-mod=vendor"
Expand All @@ -219,7 +219,7 @@ jobs:
- attach_workspace:
at: /go/src/github.com/hypnoglow
- run_integration_tests:
helm_version: 3.0.0
helm_version: 3.4.0
test-install:
docker:
- image: circleci/buildpack-deps:stretch-curl
Expand All @@ -228,15 +228,14 @@ jobs:
- run:
name: Install helm
command: |
tar_filename="helm-v2.10.0-linux-amd64.tar.gz"
checksum_filename="helm-v2.10.0-linux-amd64.tar.gz.sha256"
curl -sSL https://storage.googleapis.com/kubernetes-helm/${tar_filename} -O
curl -sSL https://storage.googleapis.com/kubernetes-helm/${checksum_filename} -O
echo "$(cat ${checksum_filename}) ${tar_filename}" | sha256sum -c
tar_filename="helm-v3.4.0-linux-amd64.tar.gz"
checksum_filename="helm-v3.4.0-linux-amd64.tar.gz.sha256sum"
curl -sSL https://get.helm.sh/${tar_filename} -O
curl -sSL https://get.helm.sh/${checksum_filename} -O
cat ${checksum_filename} | sha256sum -c
tar xzf ${tar_filename}
sudo mv linux-amd64/helm /usr/local/bin/helm
rm -rf linux-amd64 ${tar_filename} ${checksum_filename}
helm init -c
- run:
name: Install helm-s3 plugin
command: |
Expand All @@ -251,7 +250,7 @@ jobs:
helm plugin install https://github.com/hypnoglow/helm-s3.git --version ${version}
release:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.15
environment:
GO111MODULE: "on"
GOFLAGS: "-mod=vendor"
Expand All @@ -265,7 +264,7 @@ jobs:
if [ -n "$CIRCLE_TAG" ]; then
curl -sL https://git.io/goreleaser | bash
fi
docker-helm-2_14:
docker-helm-2_16:
docker:
- image: circleci/buildpack-deps:stretch
working_directory: ~/workspace/helm-s3
Expand All @@ -275,8 +274,8 @@ jobs:
- setup_remote_docker:
version: 18.06.0-ce
- build_push_docker_image:
helm_version: 2.14.3
docker-helm-2_15:
helm_version: 2.16.12
docker-helm-2_17:
docker:
- image: circleci/buildpack-deps:stretch
working_directory: ~/workspace/helm-s3
Expand All @@ -286,8 +285,8 @@ jobs:
- setup_remote_docker:
version: 18.06.0-ce
- build_push_docker_image:
helm_version: 2.15.2
docker-helm-2_16:
helm_version: 2.17.0
docker-helm-3_3:
docker:
- image: circleci/buildpack-deps:stretch
working_directory: ~/workspace/helm-s3
Expand All @@ -297,8 +296,8 @@ jobs:
- setup_remote_docker:
version: 18.06.0-ce
- build_push_docker_image:
helm_version: 2.16.1
docker-helm-3_0:
helm_version: 3.3.4
docker-helm-3_4:
docker:
- image: circleci/buildpack-deps:stretch
working_directory: ~/workspace/helm-s3
Expand All @@ -308,7 +307,7 @@ jobs:
- setup_remote_docker:
version: 18.06.0-ce
- build_push_docker_image:
helm_version: 3.0.0
helm_version: 3.4.0

workflows:
version: 2
Expand All @@ -319,59 +318,56 @@ workflows:
- test-unit:
requires:
- dep
- test-integration-helm-2_14:
- test-integration-helm-2_16:
requires:
- dep
- test-integration-helm-2_15:
- test-integration-helm-2_17:
requires:
- dep
- test-integration-helm-2_16:
- test-integration-helm-3_3:
requires:
- dep
- test-integration-helm-3_0:
- test-integration-helm-3_4:
requires:
- dep
- docker-helm-2_14:
- docker-helm-2_16:
requires:
- dep
- test-unit
- test-integration-helm-2_14
- test-integration-helm-2_15
- test-integration-helm-2_16
- test-integration-helm-3_0
filters:
branches:
only: master
- docker-helm-2_15:
- docker-helm-2_17:
requires:
- dep
- test-unit
- test-integration-helm-2_14
- test-integration-helm-2_15
- test-integration-helm-2_16
- test-integration-helm-3_0
- test-integration-helm-2_17
filters:
branches:
only: master
- docker-helm-2_16:
- docker-helm-3_3:
requires:
- dep
- test-unit
- test-integration-helm-2_14
- test-integration-helm-2_15
- test-integration-helm-2_16
- test-integration-helm-3_0
- test-integration-helm-3_3
filters:
branches:
only: master
- docker-helm-3_0:
- docker-helm-3_4:
requires:
- dep
- test-unit
- test-integration-helm-2_14
- test-integration-helm-2_15
- test-integration-helm-3_4
filters:
branches:
only: master
- test-install:
requires:
- test-integration-helm-2_16
- test-integration-helm-3_0
- test-integration-helm-2_17
- test-integration-helm-3_3
- test-integration-helm-3_4
filters:
branches:
only: master
Expand All @@ -384,31 +380,31 @@ workflows:
only: /.*/
branches:
ignore: /.*/
- docker-helm-2_14:
- docker-helm-2_16:
requires:
- dep
filters:
tags:
only: /.*/
branches:
ignore: /.*/
- docker-helm-2_15:
- docker-helm-2_17:
requires:
- dep
filters:
tags:
only: /.*/
branches:
ignore: /.*/
- docker-helm-2_16:
- docker-helm-3_3:
requires:
- dep
filters:
tags:
only: /.*/
branches:
ignore: /.*/
- docker-helm-3_0:
- docker-helm-3_4:
requires:
- dep
filters:
Expand All @@ -419,10 +415,10 @@ workflows:
- release:
requires:
- dep
- docker-helm-2_14
- docker-helm-2_15
- docker-helm-2_16
- docker-helm-3_0
- docker-helm-2_17
- docker-helm-3_3
- docker-helm-3_4
filters:
tags:
only: /.*/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG HELM_VERSION

FROM golang:1.12-alpine as build
FROM golang:1.15-alpine as build

ARG PLUGIN_VERSION

Expand Down
20 changes: 9 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
module github.com/hypnoglow/helm-s3

go 1.12
go 1.15

// See: https://github.com/helm/helm/issues/6994
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309

require (
github.com/Masterminds/semver v1.5.0
github.com/Masterminds/semver/v3 v3.0.1
github.com/aws/aws-sdk-go v1.25.50
github.com/Masterminds/semver/v3 v3.1.0
github.com/aws/aws-sdk-go v1.27.0
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.3.1
github.com/google/go-cmp v0.4.0
github.com/minio/minio-go/v6 v6.0.40
github.com/pkg/errors v0.8.1
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
github.com/stretchr/testify v1.4.0
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.6.1
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/ini.v1 v1.49.0 // indirect
helm.sh/helm/v3 v3.0.0
k8s.io/helm v2.16.1+incompatible
sigs.k8s.io/yaml v1.1.0
helm.sh/helm/v3 v3.4.0
k8s.io/helm v2.17.0+incompatible
sigs.k8s.io/yaml v1.2.0
)
Loading

0 comments on commit 5312896

Please sign in to comment.