Skip to content

Commit

Permalink
Bump several modules
Browse files Browse the repository at this point in the history
 - `k8s.io/*` bundle to `v0.22.2` (controller-gen tool makes changes in CRD description after bump)
 - `github.com/golang/mock` to `v1.6.0` (is not compiled into final binary but checked by dependabot)
 - `github.com/miekg/dns` to `v1.1.43`
 - `github.com/infobloxopen/infoblox-go-client` to `v1.1.1` (changes argument CreateTXTRecord from integer to uint)

The latest `sigs.k8s.io/external-dns` is problematic in terms it uses latest `github.com/go-logr/logr` which is incompatible
with previous versions. This causes issues in `controller-runtime` and will require code changes on our side (another PR).
[This PR](kubernetes-sigs/controller-runtime#1593 (comment)) would be unblock
 - github.com/go-logr/logr
 - sigs.k8s.io/external-dns

Signed-off-by: kuritka <kuritka@gmail.com>
  • Loading branch information
kuritka committed Oct 26, 2021
1 parent 60428ec commit 30e2716
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 522 deletions.
4 changes: 2 additions & 2 deletions chart/k8gb/templates/crds/k8gb.absa.oss_gslbs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ spec:
of an incoming request. Currently it can contain
characters disallowed from the conventional
"path" part of a URL as defined by RFC 3986.
Paths must begin with a '/'. When unspecified,
all paths from incoming requests are matched.
Paths must begin with a '/' and must be present
when using PathType with value "Exact" or "Prefix".
type: string
pathType:
description: 'PathType determines the interpretation
Expand Down
2 changes: 1 addition & 1 deletion controllers/providers/dns/infoblox.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func (p *InfobloxProvider) saveHeartbeatTXTRecord(objMgr *ibclient.ObjectManager
log.Info().
Str("HeartbeatTXTName", heartbeatTXTName).
Msg("Creating split brain TXT record")
_, err = objMgr.CreateTXTRecord(heartbeatTXTName, edgeTimestamp, gslb.Spec.Strategy.DNSTtlSeconds, "default")
_, err = objMgr.CreateTXTRecord(heartbeatTXTName, edgeTimestamp, uint(gslb.Spec.Strategy.DNSTtlSeconds), "default")
if err != nil {
m.InfobloxIncrementHeartbeatError(gslb)
return
Expand Down
16 changes: 7 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@ module github.com/k8gb-io/k8gb
go 1.16

require (
github.com/AbsaOSS/env-binder v1.0.0
github.com/AbsaOSS/gopkg v0.1.2
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v0.4.0
github.com/golang/mock v1.5.0
github.com/infobloxopen/infoblox-go-client v1.1.0
github.com/miekg/dns v1.1.42
github.com/golang/mock v1.6.0
github.com/infobloxopen/infoblox-go-client v1.1.1
github.com/miekg/dns v1.1.43
github.com/prometheus/client_golang v1.11.0
github.com/rs/zerolog v1.21.0
github.com/stretchr/testify v1.7.0
k8s.io/api v0.21.2
k8s.io/apimachinery v0.21.2
k8s.io/client-go v0.21.2
k8s.io/api v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
sigs.k8s.io/controller-runtime v0.9.2
sigs.k8s.io/external-dns v0.8.0
github.com/AbsaOSS/env-binder v1.0.0
)

replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e

0 comments on commit 30e2716

Please sign in to comment.