diff --git a/Dockerfile b/Dockerfile index e5486aa..e74e347 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,11 @@ MAINTAINER Ivan Pedrazas # Helm version: can be passed at build time ARG VERSION -ENV VERSION ${VERSION:-v2.9.1} +ENV VERSION ${VERSION:-v2.11.0} ENV FILENAME helm-${VERSION}-linux-amd64.tar.gz ARG KUBECTL -ENV KUBECTL ${KUBECTL:-v1.11.0} +ENV KUBECTL ${KUBECTL:-v1.11.2} RUN set -ex \ && apk add --no-cache curl ca-certificates \ diff --git a/Gopkg.lock b/Gopkg.lock index ab9824d..ff6c9a6 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,12 +2,12 @@ [[projects]] - digest = "1:3b8f5d88e2b182b77f04355ed40c8810e516913bedc51b4ffd17ec506613a90e" + digest = "1:3f53e9e4dfbb664cd62940c9c4b65a2171c66acd0b7621a1a6b8e78513525a52" name = "github.com/Sirupsen/logrus" packages = ["."] pruneopts = "UT" - revision = "a3f95b5c423586578a4e099b11a46c2479628cac" - version = "1.0.2" + revision = "ad15b42461921f1fb3529b058c6786c6a45d5162" + version = "v1.1.1" [[projects]] branch = "master" @@ -22,41 +22,60 @@ [[projects]] branch = "master" - digest = "1:87009a0bb1cfbdf3e4659482c9c2259ab669162e3395cf05c63c01f6a0579a4c" + digest = "1:f7596b8262a5afc7a0152cf25b8945899fb7595815510cb440669af332136ac5" name = "github.com/ipedrazas/drone-helm" packages = ["plugin"] pruneopts = "UT" - revision = "057547a6f11d0e4dffbf194bfe9e538013bfdbfa" + revision = "8e7b0b391270265092b9cb1cb4d19acf163c2750" [[projects]] - digest = "1:d8cadef127871902b9aaa711a74bf6dd74feeb3f97b67c31b9dcdd02b8284b45" + digest = "1:ecd9aa82687cf31d1585d4ac61d0ba180e42e8a6182b85bd785fcca8dfeefc1b" name = "github.com/joho/godotenv" packages = ["."] pruneopts = "UT" - revision = "726cc8b906e3d31c70a9671c90a13716a8d3f50d" - version = "v1.1" + revision = "23d116af351c84513e1946b527c88823e476be13" + version = "v1.3.0" [[projects]] - digest = "1:01d3c3dfb7ef9da24cd00cbd5b9e2c147fa7a3f44a83028bc737da9cac7ed60b" + digest = "1:0a69a1c0db3591fcefb47f115b224592c8dfa4368b7ba9fae509d5e16cdc95c8" + name = "github.com/konsorten/go-windows-terminal-sequences" + packages = ["."] + pruneopts = "UT" + revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242" + version = "v1.0.1" + +[[projects]] + digest = "1:b24d38b282bacf9791408a080f606370efa3d364e4b5fd9ba0f7b87786d3b679" name = "github.com/urfave/cli" packages = ["."] pruneopts = "UT" - revision = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6" - version = "v1.19.1" + revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1" + version = "v1.20.0" [[projects]] - digest = "1:1823f145d46c33abc0d1b15711d24839b2266f8e23c2b8dca1d35be3b0a84029" - name = "golang.org/x/sys" - packages = ["unix"] + branch = "master" + digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] pruneopts = "UT" - revision = "c4489faa6e5ab84c0ef40d6ee878f7a030281f0f" + revision = "7c1a557ab941a71c619514f229f0b27ccb0c27cf" + +[[projects]] + branch = "master" + digest = "1:850d28ab022512e2cd3cf511a77f363c29e22689b4031f2050871f5de47ae4a0" + name = "golang.org/x/sys" + packages = [ + "unix", + "windows", + ] + pruneopts = "UT" + revision = "4497e2df6f9e69048a54498c7affbbec3294ad47" [solve-meta] analyzer-name = "dep" analyzer-version = 1 input-imports = [ "github.com/Sirupsen/logrus", - "github.com/alecthomas/template", "github.com/ipedrazas/drone-helm/plugin", "github.com/joho/godotenv", "github.com/urfave/cli", diff --git a/Gopkg.toml b/Gopkg.toml index 0068d5f..93074c4 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -30,10 +30,6 @@ ignored = ["sort"] name = "github.com/Sirupsen/logrus" version = "1.0.2" -[[constraint]] - branch = "master" - name = "github.com/alecthomas/template" - [[constraint]] name = "github.com/joho/godotenv" version = "1.1.0" diff --git a/README.md b/README.md index bac9a24..99a52ba 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ This plugin allows to deploy a [Helm](https://github.com/kubernetes/helm) chart into a [Kubernetes](https://github.com/kubernetes/kubernetes) cluster. -* Current `helm` version: 2.9.1 -* Current `kubectl` version: 1.11.0 +* Current `helm` version: 2.11.0 +* Current `kubectl` version: 1.11.2 ## Drone Pipeline Usage diff --git a/glide.lock b/glide.lock index a6af94e..6750beb 100644 --- a/glide.lock +++ b/glide.lock @@ -1,10 +1,6 @@ hash: 9b60b1eb539de483dc15c738804dc646ff3b73064a8f0711cb47810c0895ba32 updated: 2017-07-25T13:57:56.120550369+03:00 imports: -- name: github.com/alecthomas/template - version: a0175ee3bccc567396460bf5acd36800cb10c49c - subpackages: - - parse - name: github.com/joho/godotenv version: 726cc8b906e3d31c70a9671c90a13716a8d3f50d - name: github.com/Sirupsen/logrus diff --git a/glide.yaml b/glide.yaml index 609ad2d..698bac5 100644 --- a/glide.yaml +++ b/glide.yaml @@ -3,6 +3,5 @@ ignore: - sort import: - package: github.com/Sirupsen/logrus -- package: github.com/alecthomas/template - package: github.com/joho/godotenv - package: github.com/urfave/cli diff --git a/plugin/plugin.go b/plugin/plugin.go index 4a3d60a..25bbeb8 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/alecthomas/template" + "text/template" ) var HELM_BIN = "/bin/helm" diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go index db8c6f3..0e0c8ce 100644 --- a/plugin/plugin_test.go +++ b/plugin/plugin_test.go @@ -225,11 +225,11 @@ func TestResolveSecrets(t *testing.T) { // Test resolving provided values testInput := []struct { - server string - values string + server string + values string stringValues string - token string - account string + token string + account string }{ {server: "http://apiserver2", token: "123456", account: "helm2", values: "aval=test", stringValues: "long_string_value=1234567890"}, }