mirror of
https://github.com/kubernetes-sigs/external-dns.git
synced 2025-08-06 01:26:59 +02:00
Upgrade ExternalDNS to go 1.19 (#3152)
* upgrades ExternalDNS to go 1.19 Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com> * fixes testutil comparison Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com> * disable golint Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com> * bump golangici-lint Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com> * remove deprecated linters and revive Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com> * remove other linters to make it pass Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com> * remove gosimple Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com> Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com>
This commit is contained in:
Raffaele Di Fazio
GitHub
parent
00752b4b63
commit
cfce744c75
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -23,7 +23,7 @@ jobs:
|
||||
- name: Set up Go 1.x
|
||||
uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: 1.18
|
||||
go-version: 1.19
|
||||
id: go
|
||||
|
||||
- name: Check out code into the Go module directory
|
||||
@ -45,7 +45,7 @@ jobs:
|
||||
|
||||
- name: Lint
|
||||
run: |
|
||||
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2
|
||||
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.1
|
||||
make lint
|
||||
|
||||
- name: Test
|
||||
|
||||
2
.github/workflows/codeql-analysis.yml
vendored
2
.github/workflows/codeql-analysis.yml
vendored
@ -30,7 +30,7 @@ jobs:
|
||||
- name: Install go version
|
||||
uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: '^1.18'
|
||||
go-version: '^1.19'
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
|
||||
2
.github/workflows/docs.yml
vendored
2
.github/workflows/docs.yml
vendored
@ -26,7 +26,7 @@ jobs:
|
||||
|
||||
- uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: ^1.18
|
||||
go-version: ^1.19
|
||||
|
||||
- run: |
|
||||
pip install -r docs/scripts/requirements.txt
|
||||
|
||||
@ -3,8 +3,6 @@ linters-settings:
|
||||
default-signifies-exhaustive: false
|
||||
goimports:
|
||||
local-prefixes: sigs.k8s.io/external-dns
|
||||
golint:
|
||||
min-confidence: 0.9
|
||||
maligned:
|
||||
suggest-new: true
|
||||
misspell:
|
||||
@ -15,24 +13,17 @@ linters:
|
||||
# inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
|
||||
disable-all: true
|
||||
enable:
|
||||
- deadcode
|
||||
- depguard
|
||||
- dogsled
|
||||
- gofmt
|
||||
- goimports
|
||||
- goprintffuncname
|
||||
- gosimple
|
||||
- govet
|
||||
- ineffassign
|
||||
- misspell
|
||||
- rowserrcheck
|
||||
- staticcheck
|
||||
- structcheck
|
||||
- stylecheck
|
||||
- typecheck
|
||||
- unconvert
|
||||
- unused
|
||||
- varcheck
|
||||
- whitespace
|
||||
|
||||
issues:
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
# builder image
|
||||
ARG ARCH
|
||||
FROM golang:1.18 as builder
|
||||
FROM golang:1.19 as builder
|
||||
ARG ARCH
|
||||
|
||||
WORKDIR /sigs.k8s.io/external-dns
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM golang:1.18 as builder
|
||||
FROM golang:1.19 as builder
|
||||
|
||||
WORKDIR /sigs.k8s.io/external-dns
|
||||
|
||||
|
||||
4
Makefile
4
Makefile
@ -104,8 +104,8 @@ build.push/multiarch:
|
||||
for arch in $(ARCHS); do \
|
||||
image="$(IMAGE):$(VERSION)-$${arch}" ;\
|
||||
# pre-pull due to https://github.com/kubernetes-sigs/cluster-addons/pull/84/files ;\
|
||||
docker pull $${arch}/alpine:3.14 ;\
|
||||
docker pull golang:1.18 ;\
|
||||
docker pull $${arch}/alpine:3.15 ;\
|
||||
docker pull golang:1.19 ;\
|
||||
DOCKER_BUILDKIT=1 docker build --rm --tag $${image} --build-arg VERSION="$(VERSION)" --build-arg ARCH="$${arch}" . ;\
|
||||
docker push $${image} ;\
|
||||
arch_specific_tags+=( "--amend $${image}" ) ;\
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Quick Start
|
||||
|
||||
- [Git](https://git-scm.com/downloads)
|
||||
- [Go 1.18+](https://golang.org/dl/)
|
||||
- [Go 1.19+](https://golang.org/dl/)
|
||||
- [Go modules](https://github.com/golang/go/wiki/Modules)
|
||||
- [golangci-lint](https://github.com/golangci/golangci-lint)
|
||||
- [Docker](https://docs.docker.com/install/)
|
||||
|
||||
2
go.mod
2
go.mod
@ -1,6 +1,6 @@
|
||||
module sigs.k8s.io/external-dns
|
||||
|
||||
go 1.18
|
||||
go 1.19
|
||||
|
||||
require (
|
||||
cloud.google.com/go/compute v1.9.0
|
||||
|
||||
@ -42,6 +42,13 @@ func (b byAllFields) Less(i, j int) bool {
|
||||
if b[i].DNSName == b[j].DNSName {
|
||||
// This rather bad, we need a more complex comparison for Targets, which considers all elements
|
||||
if b[i].Targets.Same(b[j].Targets) {
|
||||
if b[i].RecordType == (b[j].RecordType) {
|
||||
sa := b[i].ProviderSpecific
|
||||
sb := b[j].ProviderSpecific
|
||||
sort.Sort(byNames(sa))
|
||||
sort.Sort(byNames(sb))
|
||||
return reflect.DeepEqual(sa, sb)
|
||||
}
|
||||
return b[i].RecordType <= b[j].RecordType
|
||||
}
|
||||
return b[i].Targets.String() <= b[j].Targets.String()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user