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
63036e70
Commit
63036e70
authored
Nov 30, 2023
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build the controller with golang 1.21.
parent
5a8d23b2
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
221 additions
and
516 deletions
+221
-516
Dockerfile.controller
container/Dockerfile.controller
+3
-3
go.mod
go.mod
+51
-51
go.sum
go.sum
+164
-460
ingress.go
pkg/controller/ingress.go
+3
-2
No files found.
container/Dockerfile.controller
View file @
63036e70
FROM golang:1.
17
as builder
FROM golang:1.
21
as builder
RUN apt-get update -q && \
apt-get install -y golang-golang-x-tools pandoc
RUN g
o get -d -v
github.com/slimhazard/gogitversion && \
cd
/go/pkg/mod/github.com/slimhazard/gogitversion*
&& \
RUN g
it clone https://
github.com/slimhazard/gogitversion && \
cd
gogitversion
&& \
chmod 755 bootstrap.sh && \
make install
...
...
go.mod
View file @
63036e70
module code.uplex.de/uplex-varnish/k8s-ingress
go 1.
17
go 1.
21
require (
code.uplex.de/uplex-varnish/varnishapi v0.0.0-20191205154529-31e610a4139d
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/go-openapi/analysis v0.20.1 // indirect
github.com/go-openapi/errors v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/runtime v0.19.29 // indirect
github.com/go-openapi/strfmt v0.20.1
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-openapi/validate v0.20.2 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/errors v0.20.4 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/strfmt v0.21.7
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/validate v0.22.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-cmp v0.5.5
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/google/go-cmp v0.6.0
github.com/haproxytech/models/v2 v2.2.0
github.com/imdario/mergo v0.3.6 // indirect
github.com/imdario/mergo v0.3.
1
6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/prometheus/client_golang v
0.9.2
github.com/prometheus/client_golang v
1.17.0
github.com/sergi/go-diff v1.1.0 // indirect
github.com/sirupsen/logrus v1.
6.0
go.mongodb.org/mongo-driver v1.
5.3
// indirect
golang.org/x/net v0.
0.0-20210525063256-abc453219eb5
// indirect
k8s.io/api v0.2
2.1
k8s.io/apimachinery v0.2
2.1
k8s.io/client-go v0.2
2.1
github.com/sirupsen/logrus v1.
9.3
go.mongodb.org/mongo-driver v1.
12.1
// indirect
golang.org/x/net v0.
17.0
// indirect
k8s.io/api v0.2
8.0
k8s.io/apimachinery v0.2
8.0
k8s.io/client-go v0.2
8.0
)
require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/e
vanphx/json-patch v4.11.0+incompatible
// indirect
github.com/
go-logr/logr v0.4.0
// indirect
github.com/go-
openapi/jsonpointer v0.19.5
// indirect
github.com/go-openapi/
loads v0.20.2
// indirect
github.com/go-openapi/
spec v0.20.3
// indirect
github.com/go-
stack/stack v1.8.0
// indirect
github.com/e
micklei/go-restful/v3 v3.11.0
// indirect
github.com/
evanphx/json-patch v5.7.0+incompatible
// indirect
github.com/go-
logr/logr v1.2.4
// indirect
github.com/go-openapi/
jsonpointer v0.20.0
// indirect
github.com/go-openapi/
loads v0.21.2
// indirect
github.com/go-
openapi/spec v0.20.9
// indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.
0.0-20190812154241-14fe0d1b01d4
// indirect
github.com/prometheus/common v0.
0.0-20181126121408-4724e9255275
// indirect
github.com/prometheus/procfs v0.
0.0-20181204211112-1dc9a6cbc91a
// indirect
github.com/prometheus/client_model v0.
5.0
// indirect
github.com/prometheus/common v0.
44.0
// indirect
github.com/prometheus/procfs v0.
12.0
// indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/oauth2 v0.
0.0-20200107190931-bf48bf16ab8d
// indirect
golang.org/x/sys v0.
0.0-20210616094352-59db8d763f22
// indirect
golang.org/x/term v0.
0.0-20210220032956-6a3ed077a48d
// indirect
golang.org/x/text v0.
3.6
// indirect
golang.org/x/time v0.
0.0-20210723032227-1f47c861a9ac
// indirect
google.golang.org/appengine v1.6.
5
// indirect
google.golang.org/protobuf v1.
26
.0 // indirect
golang.org/x/oauth2 v0.
13.0
// indirect
golang.org/x/sys v0.
13.0
// indirect
golang.org/x/term v0.
13.0
// indirect
golang.org/x/text v0.
13.0
// indirect
golang.org/x/time v0.
3.0
// indirect
google.golang.org/appengine v1.6.
8
// indirect
google.golang.org/protobuf v1.
31
.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
go.sum
View file @
63036e70
This diff is collapsed.
Click to expand it.
pkg/controller/ingress.go
View file @
63036e70
...
...
@@ -1093,7 +1093,7 @@ func (worker *NamespaceWorker) updateIngStatus(
return
update
.
MakeSuccess
(
""
)
}
lb
:=
make
([]
api_v1
.
LoadBalancerIngress
,
len
(
ips
)
+
len
(
hosts
))
lb
:=
make
([]
net_v1
.
Ingress
LoadBalancerIngress
,
len
(
ips
)
+
len
(
hosts
))
n
:=
0
for
host
:=
range
hosts
{
lb
[
n
]
.
Hostname
=
host
...
...
@@ -1106,7 +1106,8 @@ func (worker *NamespaceWorker) updateIngStatus(
for
_
,
ing
:=
range
ings
{
ing
.
Status
.
LoadBalancer
.
Ingress
=
make
([]
api_v1
.
LoadBalancerIngress
,
len
(
ips
)
+
len
(
hosts
))
make
([]
net_v1
.
IngressLoadBalancerIngress
,
len
(
ips
)
+
len
(
hosts
))
copy
(
ing
.
Status
.
LoadBalancer
.
Ingress
,
lb
)
ingClient
:=
worker
.
client
.
NetworkingV1
()
.
Ingresses
(
ing
.
Namespace
)
...
...
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