From 480be795329c4ab0a000e040c0826099ae401e72 Mon Sep 17 00:00:00 2001 From: usamaahmadkhan Date: Tue, 18 Feb 2020 12:35:15 +0500 Subject: [PATCH 1/7] update Jenkinsfile to new method --- Jenkinsfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e6ecb6c..4f4ce45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,7 @@ -#!/usr/bin/groovy -@Library('github.com/stakater/fabric8-pipeline-library@v2.10.8') +#!/usr/bin/env groovy +@Library('github.com/stakater/stakater-pipeline-library@v2.16.15') _ -def dummy - -goBuildAndRelease { +goBuildViaGoReleaser { publicChartRepositoryURL = 'https://stakater.github.io/stakater-charts' publicChartGitURL = 'git@github.com:stakater/stakater-charts.git' } From aafd30a37a88eb6ca6a3cdbfb8784e7004404a54 Mon Sep 17 00:00:00 2001 From: usamaahmadkhan Date: Tue, 18 Feb 2020 12:35:30 +0500 Subject: [PATCH 2/7] update deployment apiversion --- .../kubernetes/chart/gitwebhookproxy/templates/deployment.yaml | 2 +- deployments/kubernetes/manifests/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml b/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml index d13fd3a..32040b4 100644 --- a/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml +++ b/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index 0092d34..69461f5 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -1,6 +1,6 @@ --- # Source: gitwebhookproxy/templates/deployment.yaml -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: From 810c59841cc7c6ebb105021fd3b4d4d4c2e27e1e Mon Sep 17 00:00:00 2001 From: usamaahmadkhan Date: Tue, 18 Feb 2020 13:00:37 +0500 Subject: [PATCH 3/7] update makefile and template deployment api version --- Makefile | 5 ++--- .../chart/gitwebhookproxy/templates/_helpers.tpl | 11 +++++++++++ .../chart/gitwebhookproxy/templates/deployment.yaml | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6abc79d..fa5d919 100644 --- a/Makefile +++ b/Makefile @@ -13,14 +13,13 @@ VERSION=$(shell cat .version) BUILD= GOCMD = go -GLIDECMD = glide GOFLAGS ?= $(GOFLAGS:) LDFLAGS = default: build test install: - "$(GLIDECMD)" install + "$(GOCMD)" mod download build: "$(GOCMD)" build ${GOFLAGS} ${LDFLAGS} -o "${BINARY}" @@ -49,4 +48,4 @@ push: ## push the latest Docker image to DockerHub apply: kubectl apply -f deployments/manifests/ -deploy: binary-image push apply +deploy: binary-image push apply \ No newline at end of file diff --git a/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl b/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl index 8a7ba52..5338231 100644 --- a/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl +++ b/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl @@ -35,3 +35,14 @@ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} {{- end -}} + +{{/* +Return the appropriate apiVersion for deployment. +*/}} +{{- define "deployment.apiVersion" -}} +{{- if semverCompare ">=1.9-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "apps/v1" -}} +{{- else -}} +{{- print "extensions/v1beta1" -}} +{{- end -}} +{{- end -}} \ No newline at end of file diff --git a/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml b/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml index 32040b4..9742b9e 100644 --- a/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml +++ b/deployments/kubernetes/chart/gitwebhookproxy/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1 +apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: labels: From 5804ba363f0db3c566aa781cb4a6af30fb93e2a3 Mon Sep 17 00:00:00 2001 From: usamaahmadkhan Date: Tue, 18 Feb 2020 13:19:11 +0500 Subject: [PATCH 4/7] use go mod instead of glide --- Jenkinsfile | 2 +- .../chart/gitwebhookproxy/templates/_helpers.tpl | 2 +- glide.lock | 10 ---------- glide.yaml | 8 -------- go.mod | 9 +++++++++ go.sum | 6 ++++++ pkg/proxy/proxy_test.go | 2 +- 7 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 glide.lock delete mode 100644 glide.yaml create mode 100644 go.mod create mode 100644 go.sum diff --git a/Jenkinsfile b/Jenkinsfile index 4f4ce45..fe70fb1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,4 +4,4 @@ goBuildViaGoReleaser { publicChartRepositoryURL = 'https://stakater.github.io/stakater-charts' publicChartGitURL = 'git@github.com:stakater/stakater-charts.git' -} +} \ No newline at end of file diff --git a/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl b/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl index 5338231..4e67f9e 100644 --- a/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl +++ b/deployments/kubernetes/chart/gitwebhookproxy/templates/_helpers.tpl @@ -45,4 +45,4 @@ Return the appropriate apiVersion for deployment. {{- else -}} {{- print "extensions/v1beta1" -}} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 8a59b7c..0000000 --- a/glide.lock +++ /dev/null @@ -1,10 +0,0 @@ -hash: 93609c878999b5dd8322e57c55368fa4b69b4a1083ebbecfbb9fc7a9130be99b -updated: 2018-10-23T18:44:16.508340352+05:00 -imports: -- name: github.com/julienschmidt/httprouter - version: adbc77eec0d91467376ca515bc3a14b8434d0f18 -- name: github.com/namsral/flag - version: 67f268f20922975c067ed799e4be6bacf152208c -- name: gopkg.in/jarcoal/httpmock.v1 - version: eb84b840d3d6889d2458ceed28e3c6f0d109f6c8 -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 2afeb1e..0000000 --- a/glide.yaml +++ /dev/null @@ -1,8 +0,0 @@ -package: github.com/stakater/GitWebhookProxy -import: -- package: github.com/julienschmidt/httprouter - version: adbc77eec0d91467376ca515bc3a14b8434d0f18 -- package: github.com/namsral/flag - version: 67f268f20922975c067ed799e4be6bacf152208c -- package: gopkg.in/jarcoal/httpmock.v1 - version: eb84b840d3d6889d2458ceed28e3c6f0d109f6c8 diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..5209c24 --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module github.com/stakater/GitWebhookProxy + +go 1.13 + +require ( + github.com/jarcoal/httpmock v1.0.4 + github.com/julienschmidt/httprouter v1.3.0 + github.com/namsral/flag v1.7.4-pre +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..55c1ff9 --- /dev/null +++ b/go.sum @@ -0,0 +1,6 @@ +github.com/jarcoal/httpmock v1.0.4 h1:jp+dy/+nonJE4g4xbVtl9QdrUNbn6/3hDT5R4nDIZnA= +github.com/jarcoal/httpmock v1.0.4/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/namsral/flag v1.7.4-pre h1:b2ScHhoCUkbsq0d2C15Mv+VU8bl8hAXV8arnWiOHNZs= +github.com/namsral/flag v1.7.4-pre/go.mod h1:OXldTctbM6SWH1K899kPZcf65KxJiD7MsceFUpB5yDo= diff --git a/pkg/proxy/proxy_test.go b/pkg/proxy/proxy_test.go index 851d8ab..81d28a2 100644 --- a/pkg/proxy/proxy_test.go +++ b/pkg/proxy/proxy_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" + httpmock "github.com/jarcoal/httpmock" "github.com/julienschmidt/httprouter" "github.com/stakater/GitWebhookProxy/pkg/providers" - httpmock "gopkg.in/jarcoal/httpmock.v1" ) const ( From 0f88215892fde5ec6a5bed6936ee6b380ca2c267 Mon Sep 17 00:00:00 2001 From: usamaahmadkhan Date: Tue, 18 Feb 2020 13:36:37 +0500 Subject: [PATCH 5/7] update dockerfile to use go mod --- build/package/Dockerfile.build | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/build/package/Dockerfile.build b/build/package/Dockerfile.build index 1e095c8..0383c68 100644 --- a/build/package/Dockerfile.build +++ b/build/package/Dockerfile.build @@ -1,4 +1,4 @@ -FROM stakater/go-glide:1.9.3 +FROM golang:1.13.1-alpine MAINTAINER "Stakater Team" RUN apk update @@ -8,11 +8,22 @@ RUN apk -v --update \ rm -rf /var/cache/apk/* && \ mkdir -p "$GOPATH/src/github.com/stakater/GitWebhookProxy" +ARG PACKR_VERSION=2.7.1 +ARG PACKR_FILENAME=packr_${PACKR_VERSION}_linux_386.tar.gz +ARG PACKR_URL=https://github.com/gobuffalo/packr/releases/download/v${PACKR_VERSION}/${PACKR_FILENAME} + +RUN mkdir -p /tmp/packr/ && \ + wget ${PACKR_URL} -O /tmp/packr/${PACKR_FILENAME} && \ + tar -xzvf /tmp/packr/${PACKR_FILENAME} -C /tmp/packr/ && \ + mv /tmp/packr/packr2 /usr/local/bin/packr2 && \ + rm -rf /tmp/packr + ADD . "$GOPATH/src/github.com/stakater/GitWebhookProxy" RUN cd "$GOPATH/src/github.com/stakater/GitWebhookProxy" && \ - glide update && \ - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a --installsuffix cgo --ldflags="-s" -o /GitWebhookProxy + go mod download && \ + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 packr2 build -a --installsuffix cgo --ldflags="-s" -o /GitWebhookProxy && \ + packr2 clean COPY build/package/Dockerfile.run / From e753b827e179b7094574641c4dee7d66418033b1 Mon Sep 17 00:00:00 2001 From: usamaahmadkhan Date: Tue, 18 Feb 2020 13:45:11 +0500 Subject: [PATCH 6/7] remove unnecesary packages --- build/package/Dockerfile.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/package/Dockerfile.build b/build/package/Dockerfile.build index 0383c68..dda32ff 100644 --- a/build/package/Dockerfile.build +++ b/build/package/Dockerfile.build @@ -22,8 +22,7 @@ ADD . "$GOPATH/src/github.com/stakater/GitWebhookProxy" RUN cd "$GOPATH/src/github.com/stakater/GitWebhookProxy" && \ go mod download && \ - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 packr2 build -a --installsuffix cgo --ldflags="-s" -o /GitWebhookProxy && \ - packr2 clean + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a --installsuffix cgo --ldflags="-s" -o /GitWebhookProxy COPY build/package/Dockerfile.run / From ba1aac1cdb87e489ebbd4328a208a1f35405250e Mon Sep 17 00:00:00 2001 From: usamaahmadkhan Date: Tue, 18 Feb 2020 15:08:12 +0500 Subject: [PATCH 7/7] remove packr --- build/package/Dockerfile.build | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/build/package/Dockerfile.build b/build/package/Dockerfile.build index dda32ff..799df16 100644 --- a/build/package/Dockerfile.build +++ b/build/package/Dockerfile.build @@ -8,16 +8,6 @@ RUN apk -v --update \ rm -rf /var/cache/apk/* && \ mkdir -p "$GOPATH/src/github.com/stakater/GitWebhookProxy" -ARG PACKR_VERSION=2.7.1 -ARG PACKR_FILENAME=packr_${PACKR_VERSION}_linux_386.tar.gz -ARG PACKR_URL=https://github.com/gobuffalo/packr/releases/download/v${PACKR_VERSION}/${PACKR_FILENAME} - -RUN mkdir -p /tmp/packr/ && \ - wget ${PACKR_URL} -O /tmp/packr/${PACKR_FILENAME} && \ - tar -xzvf /tmp/packr/${PACKR_FILENAME} -C /tmp/packr/ && \ - mv /tmp/packr/packr2 /usr/local/bin/packr2 && \ - rm -rf /tmp/packr - ADD . "$GOPATH/src/github.com/stakater/GitWebhookProxy" RUN cd "$GOPATH/src/github.com/stakater/GitWebhookProxy" && \