Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
k8s-ingress
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
uplex-varnish
k8s-ingress
Commits
7ef604fb
Commit
7ef604fb
authored
Dec 17, 2019
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update for builds with go 1.11.6 with module support (no more vgo).
parent
792efa97
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
32 deletions
+18
-32
Makefile
Makefile
+11
-14
Dockerfile.controller
container/Dockerfile.controller
+5
-5
go.mod
go.mod
+1
-4
go.sum
go.sum
+1
-9
No files found.
Makefile
View file @
7ef604fb
...
@@ -26,21 +26,18 @@
...
@@ -26,21 +26,18 @@
all
:
k8s-ingress
all
:
k8s-ingress
vgo
:
go get golang.org/x/vgo
KUBEVER
=
kubernetes-1.9.11
KUBEVER
=
kubernetes-1.9.11
install-code-gen
:
install-code-gen
:
v
go get k8s.io/code-generator/cmd/client-gen@
$(KUBEVER)
go get k8s.io/code-generator/cmd/client-gen@
$(KUBEVER)
v
go get k8s.io/code-generator/cmd/deepcopy-gen@
$(KUBEVER)
go get k8s.io/code-generator/cmd/deepcopy-gen@
$(KUBEVER)
v
go get k8s.io/code-generator/cmd/lister-gen@
$(KUBEVER)
go get k8s.io/code-generator/cmd/lister-gen@
$(KUBEVER)
v
go get k8s.io/code-generator/cmd/informer-gen@
$(KUBEVER)
go get k8s.io/code-generator/cmd/informer-gen@
$(KUBEVER)
CODE_SUBDIRS
=
./pkg/... ./cmd/...
CODE_SUBDIRS
=
./pkg/... ./cmd/...
build
:
vgo
build
:
v
go
fmt
$(CODE_SUBDIRS)
go
fmt
$(CODE_SUBDIRS)
v
go generate
$(CODE_SUBDIRS)
go generate
$(CODE_SUBDIRS)
v
go build
$(CODE_SUBDIRS)
go build
$(CODE_SUBDIRS)
GENVER
=
code.uplex.de/uplex-varnish/k8s-ingress/pkg/apis/varnishingress/v1alpha1
GENVER
=
code.uplex.de/uplex-varnish/k8s-ingress/pkg/apis/varnishingress/v1alpha1
BOILERPLATE
=
hack/boilerplate.txt
BOILERPLATE
=
hack/boilerplate.txt
...
@@ -64,7 +61,7 @@ generate: install-code-gen
...
@@ -64,7 +61,7 @@ generate: install-code-gen
--output-package
$(CLIENTPKG)
/informers
-h
$(BOILERPLATE)
--output-package
$(CLIENTPKG)
/informers
-h
$(BOILERPLATE)
k8s-ingress
:
build
k8s-ingress
:
build
CGO_ENABLED
=
0
GOOS
=
linux
v
go build
-ldflags
=
"-w -s"
-o
k8s-ingress
\
CGO_ENABLED
=
0
GOOS
=
linux go build
-ldflags
=
"-w -s"
-o
k8s-ingress
\
cmd/
*
.go
cmd/
*
.go
check
:
build
check
:
build
...
@@ -73,11 +70,11 @@ check: build
...
@@ -73,11 +70,11 @@ check: build
golint ./pkg/varnish/...
golint ./pkg/varnish/...
golint ./pkg/apis/varnishingress/v1alpha1/...
golint ./pkg/apis/varnishingress/v1alpha1/...
golint ./cmd/...
golint ./cmd/...
v
go
test
-v
./pkg/controller/... ./pkg/interfaces/... ./pkg/varnish/...
go
test
-v
./pkg/controller/... ./pkg/interfaces/... ./pkg/varnish/...
test
:
check
test
:
check
clean
:
clean
:
v
go clean
$(CODE_SUBDIRS)
go clean
$(CODE_SUBDIRS)
rm
-f
cmd/main_version.go
rm
-f
cmd/main_version.go
rm
-f
k8s-ingress
rm
-f
k8s-ingress
container/Dockerfile.controller
View file @
7ef604fb
FROM golang:1.10.5 as builder
FROM golang:1.11.6 as builder
RUN go get -u golang.org/x/vgo
RUN go get -d -v github.com/slimhazard/gogitversion && \
RUN go get -d -v github.com/slimhazard/gogitversion && \
cd /go/src/github.com/slimhazard/gogitversion && \
cd /go/src/github.com/slimhazard/gogitversion && \
make install
make install
...
@@ -11,14 +10,15 @@ WORKDIR /go/src/code.uplex.de/uplex-varnish/k8s-ingress
...
@@ -11,14 +10,15 @@ WORKDIR /go/src/code.uplex.de/uplex-varnish/k8s-ingress
COPY go.mod .
COPY go.mod .
COPY go.sum .
COPY go.sum .
RUN vgo mod download
ENV GO111MODULE=on
RUN go mod download
COPY ./pkg/ /go/src/code.uplex.de/uplex-varnish/k8s-ingress/pkg/
COPY ./pkg/ /go/src/code.uplex.de/uplex-varnish/k8s-ingress/pkg/
COPY ./cmd/ /go/src/code.uplex.de/uplex-varnish/k8s-ingress/cmd/
COPY ./cmd/ /go/src/code.uplex.de/uplex-varnish/k8s-ingress/cmd/
COPY ./.git/ /go/src/code.uplex.de/uplex-varnish/k8s-ingress/.git/
COPY ./.git/ /go/src/code.uplex.de/uplex-varnish/k8s-ingress/.git/
RUN
vgo generate ./cmd/... && v
go build ./pkg/... ./cmd/... && \
RUN
go generate ./cmd/... &&
go build ./pkg/... ./cmd/... && \
CGO_ENABLED=0 GOOS=linux
v
go build -ldflags="-w -s" -o k8s-ingress cmd/*.go
CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -o k8s-ingress cmd/*.go
FROM alpine:3.8
FROM alpine:3.8
COPY --from=builder /go/src/code.uplex.de/uplex-varnish/k8s-ingress/k8s-ingress /k8s-ingress
COPY --from=builder /go/src/code.uplex.de/uplex-varnish/k8s-ingress/k8s-ingress /k8s-ingress
...
...
go.mod
View file @
7ef604fb
...
@@ -26,15 +26,12 @@ require (
...
@@ -26,15 +26,12 @@ require (
github.com/prometheus/client_golang v0.9.2
github.com/prometheus/client_golang v0.9.2
github.com/sirupsen/logrus v1.2.0
github.com/sirupsen/logrus v1.2.0
github.com/spf13/pflag v1.0.3 // indirect
github.com/spf13/pflag v1.0.3 // indirect
golang.org/x/net v0.0.0-20190311183353-d8887717615a // indirect
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
golang.org/x/tools v0.0.0-20190327011446-79af862e6737 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.2.2 // indirect
gopkg.in/yaml.v2 v2.2.2 // indirect
k8s.io/api v0.0.0-20181221193117-173ce66c1e39
k8s.io/api v0.0.0-20181221193117-173ce66c1e39
k8s.io/apimachinery v0.0.0-20180925215425-1926e7bb5c13
k8s.io/apimachinery v0.0.0-20180925215425-1926e7bb5c13
k8s.io/client-go v6.0.1-0.20180515144434-1692bdde78a6+incompatible
k8s.io/client-go v6.0.1-0.20180515144434-1692bdde78a6+incompatible
k8s.io/code-generator v0.0.0-20180510141822-0ab89e584187 // indirect
k8s.io/gengo v0.0.0-20190319205223-bc9033e9ec9e // indirect
k8s.io/klog v0.2.0 // indirect
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be // indirect
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be // indirect
)
)
go.sum
View file @
7ef604fb
...
@@ -104,8 +104,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv
...
@@ -104,8 +104,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190327011446-79af862e6737 h1:aEQSysewJq5X0N9MzIyq6qGRAjsIh/V6MJtYQ1xydJ4=
golang.org/x/tools v0.0.0-20190327011446-79af862e6737/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
...
@@ -121,13 +119,7 @@ k8s.io/api v0.0.0-20181221193117-173ce66c1e39 h1:iGq7zEPXFb0IeXAQK5RiYT1SVKX/af9
...
@@ -121,13 +119,7 @@ k8s.io/api v0.0.0-20181221193117-173ce66c1e39 h1:iGq7zEPXFb0IeXAQK5RiYT1SVKX/af9
k8s.io/api v0.0.0-20181221193117-173ce66c1e39/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
k8s.io/api v0.0.0-20181221193117-173ce66c1e39/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
k8s.io/apimachinery v0.0.0-20180925215425-1926e7bb5c13 h1:XhNQCG3WplXZqDfte+QiEYqa6BrV3j81XdFy3jxNI1k=
k8s.io/apimachinery v0.0.0-20180925215425-1926e7bb5c13 h1:XhNQCG3WplXZqDfte+QiEYqa6BrV3j81XdFy3jxNI1k=
k8s.io/apimachinery v0.0.0-20180925215425-1926e7bb5c13/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
k8s.io/apimachinery v0.0.0-20180925215425-1926e7bb5c13/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
k8s.io/client-go v6.0.1-0.20180515144434-1692bdde78a6+incompatible h1:
QUglh8NubUsokcy6HJuwxOLPL60N77/it79BA+qRJRk
=
k8s.io/client-go v6.0.1-0.20180515144434-1692bdde78a6+incompatible h1:
6Vpc7zIJD1cinrZAqHzH5IOYjQVzqTr24RwI15csXV4
=
k8s.io/client-go v6.0.1-0.20180515144434-1692bdde78a6+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
k8s.io/client-go v6.0.1-0.20180515144434-1692bdde78a6+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
k8s.io/code-generator v0.0.0-20180510141822-0ab89e584187 h1:9okhnIBEqdPBTimd5LOenYh+TLynwjIZ/znXMKXM3RA=
k8s.io/code-generator v0.0.0-20180510141822-0ab89e584187/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8=
k8s.io/gengo v0.0.0-20190319205223-bc9033e9ec9e h1:JKpeawfJ0V/hMk50iOzERyANWsWsx4nZcLB9KcVo6B8=
k8s.io/gengo v0.0.0-20190319205223-bc9033e9ec9e/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be h1:aWEq4nbj7HRJ0mtKYjNSk/7X28Tl6TI6FeG8gKF+r7Q=
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be h1:aWEq4nbj7HRJ0mtKYjNSk/7X28Tl6TI6FeG8gKF+r7Q=
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment