From 7bcd5ddda46416f8ce5aeb0081fb8c0943420276 Mon Sep 17 00:00:00 2001 From: Ivan Pedrazas Date: Mon, 28 Aug 2017 23:06:41 +0100 Subject: [PATCH 1/6] drone file modified --- .drone.yml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index f676471..ee3cef0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,14 +22,26 @@ pipeline: - DOCKER_HOST=tcp://127.0.0.1:2375 - TAG=${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:7} commands: - - docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io + - docker login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io + - docker build -t image . + - docker tag image quay.io/ipedrazas/drone-helm:${TAG} + - docker push quay.io/ipedrazas/drone-helm + secrets: ["quay_username", "quay_password"] + + build_docker_latest: + image: docker:17.05 + environment: + - DOCKER_HOST=tcp://127.0.0.1:2375 + - TAG=${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:7} + commands: + - docker login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io - docker build -t image . - docker tag image quay.io/ipedrazas/drone-helm:latest - docker tag image quay.io/ipedrazas/drone-helm:${TAG} - docker push quay.io/ipedrazas/drone-helm - # when: - # event: [push] - # branch: [master] + when: + event: [push] + branch: [master] slack: image: plugins/slack @@ -37,6 +49,7 @@ pipeline: username: drone template: > {{ build.author }} finished building ** of {{ repo.name }} with a {{ build.status }} status + secrets: ["slack_webhook"] services: From a5f3e7d2c42cf1c637ea60c50e9775e652987836 Mon Sep 17 00:00:00 2001 From: Ivan Pedrazas Date: Mon, 28 Aug 2017 23:11:06 +0100 Subject: [PATCH 2/6] drone file modified --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index ee3cef0..61b55aa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,11 +20,11 @@ pipeline: image: docker:17.05 environment: - DOCKER_HOST=tcp://127.0.0.1:2375 - - TAG=${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:7} + - TAG=$DRONE_BRANCH-$DRONE_COMMIT_SHA:0:7 commands: - docker login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io - docker build -t image . - - docker tag image quay.io/ipedrazas/drone-helm:${TAG} + - docker tag image quay.io/ipedrazas/drone-helm:$TAG - docker push quay.io/ipedrazas/drone-helm secrets: ["quay_username", "quay_password"] @@ -32,12 +32,12 @@ pipeline: image: docker:17.05 environment: - DOCKER_HOST=tcp://127.0.0.1:2375 - - TAG=${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:7} + - TAG=$DRONE_BRANCH-$DRONE_COMMIT_SHA:0:7 commands: - docker login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io - docker build -t image . - docker tag image quay.io/ipedrazas/drone-helm:latest - - docker tag image quay.io/ipedrazas/drone-helm:${TAG} + - docker tag image quay.io/ipedrazas/drone-helm:$TAG - docker push quay.io/ipedrazas/drone-helm when: event: [push] From 4e7c9a88c0bcf0269bb8b7909fa97767f86fbe1b Mon Sep 17 00:00:00 2001 From: Ivan Pedrazas Date: Mon, 28 Aug 2017 23:12:40 +0100 Subject: [PATCH 3/6] drone file modified --- .drone.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 61b55aa..43079d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ pipeline: build_docker_image: - image: docker:17.05 + image: docker:17.05-dind environment: - DOCKER_HOST=tcp://127.0.0.1:2375 - TAG=$DRONE_BRANCH-$DRONE_COMMIT_SHA:0:7 @@ -29,7 +29,7 @@ pipeline: secrets: ["quay_username", "quay_password"] build_docker_latest: - image: docker:17.05 + image: docker:17.05-dind environment: - DOCKER_HOST=tcp://127.0.0.1:2375 - TAG=$DRONE_BRANCH-$DRONE_COMMIT_SHA:0:7 @@ -51,15 +51,6 @@ pipeline: {{ build.author }} finished building ** of {{ repo.name }} with a {{ build.status }} status secrets: ["slack_webhook"] - -services: - dind: - image: docker:17.05-dind - privileged: true - command: - - "-s" - - "overlay" - plugin: name: drone-helm desc: Execute helm to From f4885a737fa7c654fe58e5f430e93d54e9817eec Mon Sep 17 00:00:00 2001 From: Ivan Pedrazas Date: Mon, 28 Aug 2017 23:14:48 +0100 Subject: [PATCH 4/6] drone file modified --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index 43079d1..dfd4947 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,6 +27,8 @@ pipeline: - docker tag image quay.io/ipedrazas/drone-helm:$TAG - docker push quay.io/ipedrazas/drone-helm secrets: ["quay_username", "quay_password"] + volumes: + - /var/run/docker.sock:/var/run/docker.sock build_docker_latest: image: docker:17.05-dind @@ -39,6 +41,8 @@ pipeline: - docker tag image quay.io/ipedrazas/drone-helm:latest - docker tag image quay.io/ipedrazas/drone-helm:$TAG - docker push quay.io/ipedrazas/drone-helm + volumes: + - /var/run/docker.sock:/var/run/docker.sock when: event: [push] branch: [master] From 76efe53e688cb27834ddb7ea36fed3e036af23e6 Mon Sep 17 00:00:00 2001 From: Ivan Pedrazas Date: Mon, 28 Aug 2017 23:20:56 +0100 Subject: [PATCH 5/6] drone file modified --- .drone.yml | 69 ++++++++++++++++++++---------------------------------- 1 file changed, 25 insertions(+), 44 deletions(-) diff --git a/.drone.yml b/.drone.yml index dfd4947..041207f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,51 +1,32 @@ -workspace: - base: /go - path: src/github.com/ipedrazas/drone-helm +# workspace: +# base: /go +# path: src/github.com/ipedrazas/drone-helm pipeline: - test: - image: golang:1.8 - commands: - - go get - - go test -cover -coverprofile=coverage.out + # test: + # image: golang:1.8 + # commands: + # - go get + # - go test -cover -coverprofile=coverage.out - compile: - image: golang:1.8 - commands: - - export PATH=$PATH:/go/bin - - go build -ldflags "-s -w -X main.build=$DRONE_BUILD_NUMBER" -a -tags netgo + # compile: + # image: golang:1.8 + # commands: + # - export PATH=$PATH:/go/bin + # - go build -ldflags "-s -w -X main.build=$DRONE_BUILD_NUMBER" -a -tags netgo - - build_docker_image: - image: docker:17.05-dind - environment: - - DOCKER_HOST=tcp://127.0.0.1:2375 - - TAG=$DRONE_BRANCH-$DRONE_COMMIT_SHA:0:7 - commands: - - docker login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io - - docker build -t image . - - docker tag image quay.io/ipedrazas/drone-helm:$TAG - - docker push quay.io/ipedrazas/drone-helm - secrets: ["quay_username", "quay_password"] - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - build_docker_latest: - image: docker:17.05-dind - environment: - - DOCKER_HOST=tcp://127.0.0.1:2375 - - TAG=$DRONE_BRANCH-$DRONE_COMMIT_SHA:0:7 - commands: - - docker login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io - - docker build -t image . - - docker tag image quay.io/ipedrazas/drone-helm:latest - - docker tag image quay.io/ipedrazas/drone-helm:$TAG - - docker push quay.io/ipedrazas/drone-helm - volumes: - - /var/run/docker.sock:/var/run/docker.sock - when: - event: [push] - branch: [master] + docker-build: + # environment: + # - DOCKER_API_VERSION=1.24 + image: plugins/docker:17.05 + repo: quay.io/ipedrazas/drone-helm + tags: + - latest + - ${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:7} + registry: quay.io + email: "info@info.com" + debug: true + secrets: [ docker_username, docker_password ] slack: image: plugins/slack From 058d7f0fcad28976581376247db93e3f9979b8fa Mon Sep 17 00:00:00 2001 From: Ivan Pedrazas Date: Mon, 28 Aug 2017 23:29:04 +0100 Subject: [PATCH 6/6] cleanup --- .drone.yml | 30 ++++++++++++------------------ .drone.yml.sig | 1 - README.md | 2 ++ 3 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 .drone.yml.sig diff --git a/.drone.yml b/.drone.yml index 041207f..a6804ad 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,23 +1,16 @@ -# workspace: -# base: /go -# path: src/github.com/ipedrazas/drone-helm - pipeline: - # test: - # image: golang:1.8 - # commands: - # - go get - # - go test -cover -coverprofile=coverage.out - - # compile: - # image: golang:1.8 - # commands: - # - export PATH=$PATH:/go/bin - # - go build -ldflags "-s -w -X main.build=$DRONE_BUILD_NUMBER" -a -tags netgo docker-build: - # environment: - # - DOCKER_API_VERSION=1.24 + image: plugins/docker:17.05 + repo: quay.io/ipedrazas/drone-helm + tags: + - ${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:7} + registry: quay.io + email: "info@info.com" + debug: true + secrets: [ docker_username, docker_password ] + + docker-build-master: image: plugins/docker:17.05 repo: quay.io/ipedrazas/drone-helm tags: @@ -28,12 +21,13 @@ pipeline: debug: true secrets: [ docker_username, docker_password ] + slack: image: plugins/slack channel: deploys username: drone template: > - {{ build.author }} finished building ** of {{ repo.name }} with a {{ build.status }} status + {{ build.author }} finished building ** of {{ repo.name }} with a {{ build.status }} status secrets: ["slack_webhook"] plugin: diff --git a/.drone.yml.sig b/.drone.yml.sig deleted file mode 100644 index d5aced5..0000000 --- a/.drone.yml.sig +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9nbwogIHBhdGg6IHNyYy9naXRodWIuY29tL2lwZWRyYXphcy9kcm9uZS1oZWxtCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGdvbGFuZzoxLjgKICAgIGNvbW1hbmRzOgogICAgICAtIGdvIGdldAogICAgICAtIGdvIHRlc3QgLWNvdmVyIC1jb3ZlcnByb2ZpbGU9Y292ZXJhZ2Uub3V0CgogIGNvbXBpbGU6CiAgICBpbWFnZTogZ29sYW5nOjEuOAogICAgY29tbWFuZHM6CiAgICAgIC0gZXhwb3J0IFBBVEg9JFBBVEg6L2dvL2JpbgogICAgICAtIGdvIGJ1aWxkIC1sZGZsYWdzICItcyAtdyAtWCBtYWluLmJ1aWxkPSREUk9ORV9CVUlMRF9OVU1CRVIiIC1hIC10YWdzIG5ldGdvCgoKICBidWlsZF9kb2NrZXJfaW1hZ2U6CiAgICBpbWFnZTogZG9ja2VyOjEuMTIKICAgIGVudmlyb25tZW50OgogICAgICAtIERPQ0tFUl9IT1NUPXRjcDovLzEyNy4wLjAuMToyMzc1CiAgICAgIC0gVEFHPSR7RFJPTkVfQlJBTkNIfS0ke0RST05FX0NPTU1JVF9TSEE6MDo3fQogICAgY29tbWFuZHM6CiAgICAgIC0gZG9ja2VyIGxvZ2luIC11PSIke1FVQVlfVVNFUk5BTUV9IiAtcD0iJHtRVUFZX1BBU1NXT1JEfSIgcXVheS5pbwogICAgICAtIGRvY2tlciBidWlsZCAtdCBpbWFnZSAuCiAgICAgIC0gZG9ja2VyIHRhZyBpbWFnZSBxdWF5LmlvL2lwZWRyYXphcy9kcm9uZS1oZWxtOmxhdGVzdAogICAgICAtIGRvY2tlciB0YWcgaW1hZ2UgcXVheS5pby9pcGVkcmF6YXMvZHJvbmUtaGVsbToke1RBR30KICAgICAgLSBkb2NrZXIgcHVzaCBxdWF5LmlvL2lwZWRyYXphcy9kcm9uZS1oZWxtCiAgICAjIHdoZW46CiAgICAjICBldmVudDogW3B1c2hdCiAgICAjICBicmFuY2g6IFttYXN0ZXJdCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRlcGxveXMKICAgIHVzZXJuYW1lOiBkcm9uZQogICAgdGVtcGxhdGU6ID4KICAgICAge3sgYnVpbGQuYXV0aG9yIH19IGZpbmlzaGVkIGJ1aWxkaW5nICAqPGh0dHA6Ly9kcm9uZS5zb2hvaG91c2VkaWdpdGFsLmNvbS9Tb2hvSG91c2Uve3sgcmVwby5uYW1lIH19L3t7IGJ1aWxkLm51bWJlciB9fXx7eyBidWlsZC5icmFuY2ggfX0gKHt7IGJ1aWxkLm51bWJlciB9fSk-KiBvZiB7eyByZXBvLm5hbWUgfX0gIHdpdGggYSB7eyBidWlsZC5zdGF0dXMgfX0gc3RhdHVzCgoKc2VydmljZXM6CiAgZGluZDoKICAgIGltYWdlOiBkb2NrZXI6MS4xMi1kaW5kCiAgICBwcml2aWxlZ2VkOiB0cnVlCiAgICBjb21tYW5kOgogICAgICAtICItcyIKICAgICAgLSAib3ZlcmxheSIKCnBsdWdpbjoKICBuYW1lOiBkcm9uZS1oZWxtCiAgZGVzYzogRXhlY3V0ZSBoZWxtIHRvCiAgdHlwZTogZGVwbG95CiAgaW1hZ2U6IHF1YXkuaW8vaXBlZHJhemFzL2Ryb25lLWhlbG0KICBsYWJlbHM6CiAgICAtIGRlcGxveQogICAgLSBrdWJlcm5ldGVzCiAgICAtIGhlbG0K.TUPmXe_ZEmQLVIFZeglBkqT-iru6H_TKxURXpM-adfU \ No newline at end of file diff --git a/README.md b/README.md index 45f64bd..4e12557 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Helm (Kubernetes) plugin for drone.io +[![Build Status](https://build.kube.camp/api/badges/ipedrazas/drone-helm/status.svg)](https://build.kube.camp/ipedrazas/drone-helm) + 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.6.0