mirror of
https://github.com/kubernetes-sigs/external-dns.git
synced 2025-08-06 09:36:58 +02:00
Merge pull request #4698 from mloiseleur/chore/go1.23
chore: upgrade ExternalDNS to go 1.23
This commit is contained in:
commit
cb89c0efdd
8
.github/workflows/ci.yaml
vendored
8
.github/workflows/ci.yaml
vendored
@ -20,15 +20,15 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
|
- name: Check out code into the Go module directory
|
||||||
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
||||||
- name: Set up Go 1.x
|
- name: Set up Go 1.x
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: '1.22.4'
|
go-version-file: go.mod
|
||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: Check out code into the Go module directory
|
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
|
||||||
|
|
||||||
- name: Install CI
|
- name: Install CI
|
||||||
run: |
|
run: |
|
||||||
go get -v -t -d ./...
|
go get -v -t -d ./...
|
||||||
|
2
.github/workflows/codeql-analysis.yaml
vendored
2
.github/workflows/codeql-analysis.yaml
vendored
@ -30,7 +30,7 @@ jobs:
|
|||||||
- name: Install go version
|
- name: Install go version
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: '^1.22.4'
|
go-version-file: go.mod
|
||||||
|
|
||||||
# Initializes the CodeQL tools for scanning.
|
# Initializes the CodeQL tools for scanning.
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
|
4
.github/workflows/docs.yaml
vendored
4
.github/workflows/docs.yaml
vendored
@ -25,10 +25,6 @@ jobs:
|
|||||||
cache: "pip"
|
cache: "pip"
|
||||||
cache-dependency-path: "./docs/scripts/requirements.txt"
|
cache-dependency-path: "./docs/scripts/requirements.txt"
|
||||||
|
|
||||||
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
|
|
||||||
with:
|
|
||||||
go-version-file: 'go.mod'
|
|
||||||
|
|
||||||
- run: |
|
- run: |
|
||||||
pip install -r docs/scripts/requirements.txt
|
pip install -r docs/scripts/requirements.txt
|
||||||
|
|
||||||
|
19
.github/workflows/lint.yaml
vendored
19
.github/workflows/lint.yaml
vendored
@ -8,6 +8,7 @@ on:
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read # to fetch code (actions/checkout)
|
contents: read # to fetch code (actions/checkout)
|
||||||
|
checks: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
@ -20,16 +21,16 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Set up Go 1.x
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: '1.22.4'
|
|
||||||
id: go
|
|
||||||
|
|
||||||
- name: Check out code into the Go module directory
|
- name: Check out code into the Go module directory
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
||||||
|
- name: Set up Go 1.x
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version-file: go.mod
|
||||||
|
|
||||||
- name: Lint
|
- name: Lint
|
||||||
run: |
|
uses: golangci/golangci-lint-action@v6
|
||||||
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
|
with:
|
||||||
make lint
|
args: --timeout=30m
|
||||||
|
version: v1.60
|
||||||
|
8
.github/workflows/staging-image-tester.yaml
vendored
8
.github/workflows/staging-image-tester.yaml
vendored
@ -20,15 +20,15 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
|
- name: Check out code into the Go module directory
|
||||||
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
||||||
- name: Set up Go 1.x
|
- name: Set up Go 1.x
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: '1.22.4'
|
go-version-file: go.mod
|
||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: Check out code into the Go module directory
|
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
|
||||||
|
|
||||||
- name: Install CI
|
- name: Install CI
|
||||||
run: |
|
run: |
|
||||||
go get -v -t -d ./...
|
go get -v -t -d ./...
|
||||||
|
2
Makefile
2
Makefile
@ -41,7 +41,7 @@ CONTROLLER_GEN=$(shell which controller-gen)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
golangci-lint:
|
golangci-lint:
|
||||||
@command -v golangci-lint > /dev/null || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
|
@command -v golangci-lint > /dev/null || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.3
|
||||||
|
|
||||||
# Run the golangci-lint tool
|
# Run the golangci-lint tool
|
||||||
.PHONY: go-lint
|
.PHONY: go-lint
|
||||||
|
@ -4,7 +4,7 @@ options:
|
|||||||
substitution_option: ALLOW_LOOSE
|
substitution_option: ALLOW_LOOSE
|
||||||
machineType: 'N1_HIGHCPU_8'
|
machineType: 'N1_HIGHCPU_8'
|
||||||
steps:
|
steps:
|
||||||
- name: 'docker.io/library/golang:1.22.4-bookworm'
|
- name: 'docker.io/library/golang:1.23-bookworm'
|
||||||
entrypoint: make
|
entrypoint: make
|
||||||
env:
|
env:
|
||||||
- VERSION=$_GIT_TAG
|
- VERSION=$_GIT_TAG
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Quick Start
|
# Quick Start
|
||||||
|
|
||||||
- [Git](https://git-scm.com/downloads)
|
- [Git](https://git-scm.com/downloads)
|
||||||
- [Go 1.22+](https://golang.org/dl/)
|
- [Go 1.23+](https://golang.org/dl/)
|
||||||
- [Go modules](https://github.com/golang/go/wiki/Modules)
|
- [Go modules](https://github.com/golang/go/wiki/Modules)
|
||||||
- [golangci-lint](https://github.com/golangci/golangci-lint)
|
- [golangci-lint](https://github.com/golangci/golangci-lint)
|
||||||
- [ko](https://ko.build/)
|
- [ko](https://ko.build/)
|
||||||
|
2
go.mod
2
go.mod
@ -1,6 +1,6 @@
|
|||||||
module sigs.k8s.io/external-dns
|
module sigs.k8s.io/external-dns
|
||||||
|
|
||||||
go 1.22.4
|
go 1.23
|
||||||
|
|
||||||
require (
|
require (
|
||||||
cloud.google.com/go/compute/metadata v0.5.0
|
cloud.google.com/go/compute/metadata v0.5.0
|
||||||
|
@ -71,7 +71,7 @@ func (api *mockAPIService) DeletePrivateZoneRecord(request *privatedns.DeletePri
|
|||||||
}
|
}
|
||||||
for _, privateZoneRecord := range api.privateZoneRecords[*request.ZoneId] {
|
for _, privateZoneRecord := range api.privateZoneRecords[*request.ZoneId] {
|
||||||
deleteflag := false
|
deleteflag := false
|
||||||
if request.RecordIdSet != nil && len(request.RecordIdSet) != 0 {
|
if len(request.RecordIdSet) != 0 {
|
||||||
for _, recordId := range request.RecordIdSet {
|
for _, recordId := range request.RecordIdSet {
|
||||||
if *privateZoneRecord.RecordId == *recordId {
|
if *privateZoneRecord.RecordId == *recordId {
|
||||||
deleteflag = true
|
deleteflag = true
|
||||||
|
@ -258,16 +258,16 @@ func dealWithError(action Action, request string, err error) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func APIErrorRecord(apiAction Action, request string, response string, err error) {
|
func APIErrorRecord(apiAction Action, request string, response string, err error) {
|
||||||
log.Infof(fmt.Sprintf("APIError API: %s/%s Request: %s, Response: %s, Error: %s", apiAction.Service, apiAction.Name, request, response, err.Error()))
|
log.Infof("APIError API: %s/%s Request: %s, Response: %s, Error: %s", apiAction.Service, apiAction.Name, request, response, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
func APIRecord(apiAction Action, request string, response string) {
|
func APIRecord(apiAction Action, request string, response string) {
|
||||||
message := fmt.Sprintf("APIRecord API: %s/%s Request: %s, Response: %s", apiAction.Service, apiAction.Name, request, response)
|
message := fmt.Sprintf("APIRecord API: %s/%s Request: %s, Response: %s", apiAction.Service, apiAction.Name, request, response)
|
||||||
|
|
||||||
if apiAction.ReadOnly {
|
if apiAction.ReadOnly {
|
||||||
// log.Infof(message)
|
// log.Info(message)
|
||||||
} else {
|
} else {
|
||||||
log.Infof(message)
|
log.Info(message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ func (p *TencentCloudProvider) getDomainList() ([]*dnspod.DomainListItem, error)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if response.Response.DomainList != nil && len(response.Response.DomainList) > 0 {
|
if len(response.Response.DomainList) > 0 {
|
||||||
if !p.domainFilter.IsConfigured() {
|
if !p.domainFilter.IsConfigured() {
|
||||||
domainList = append(domainList, response.Response.DomainList...)
|
domainList = append(domainList, response.Response.DomainList...)
|
||||||
} else {
|
} else {
|
||||||
@ -119,7 +119,7 @@ func (p *TencentCloudProvider) getDomainRecordList(domain string) ([]*dnspod.Rec
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if response.Response.RecordList != nil && len(response.Response.RecordList) > 0 {
|
if len(response.Response.RecordList) > 0 {
|
||||||
for _, record := range response.Response.RecordList {
|
for _, record := range response.Response.RecordList {
|
||||||
if *record.Name == "@" && *record.Type == "NS" { // Special Record, Skip it.
|
if *record.Name == "@" && *record.Type == "NS" { // Special Record, Skip it.
|
||||||
continue
|
continue
|
||||||
|
@ -110,7 +110,7 @@ func (p *TencentCloudProvider) getPrivateZones() ([]*privatedns.PrivateZone, err
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if response.Response.PrivateZoneSet != nil && len(response.Response.PrivateZoneSet) > 0 {
|
if len(response.Response.PrivateZoneSet) > 0 {
|
||||||
privateZones = append(privateZones, response.Response.PrivateZoneSet...)
|
privateZones = append(privateZones, response.Response.PrivateZoneSet...)
|
||||||
}
|
}
|
||||||
totalCount = *response.Response.TotalCount
|
totalCount = *response.Response.TotalCount
|
||||||
@ -140,7 +140,7 @@ func (p *TencentCloudProvider) getPrivateZoneRecords(zoneId string) ([]*privated
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if response.Response.RecordSet != nil && len(response.Response.RecordSet) > 0 {
|
if len(response.Response.RecordSet) > 0 {
|
||||||
privateZoneRecords = append(privateZoneRecords, response.Response.RecordSet...)
|
privateZoneRecords = append(privateZoneRecords, response.Response.RecordSet...)
|
||||||
}
|
}
|
||||||
totalCount = *response.Response.TotalCount
|
totalCount = *response.Response.TotalCount
|
||||||
|
@ -92,7 +92,7 @@ func (p *vinyldnsProvider) Records(ctx context.Context) (endpoints []*endpoint.E
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Infof(fmt.Sprintf("Zone: [%s:%s]", zone.ID, zone.Name))
|
log.Infof("Zone: [%s:%s]", zone.ID, zone.Name)
|
||||||
records, err := p.client.RecordSets(zone.ID)
|
records, err := p.client.RecordSets(zone.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -101,7 +101,7 @@ func (p *vinyldnsProvider) Records(ctx context.Context) (endpoints []*endpoint.E
|
|||||||
for _, r := range records {
|
for _, r := range records {
|
||||||
if provider.SupportedRecordType(r.Type) {
|
if provider.SupportedRecordType(r.Type) {
|
||||||
recordsCount := len(r.Records)
|
recordsCount := len(r.Records)
|
||||||
log.Debugf(fmt.Sprintf("%s.%s.%d.%s", r.Name, r.Type, recordsCount, zone.Name))
|
log.Debugf("%s.%s.%d.%s", r.Name, r.Type, recordsCount, zone.Name)
|
||||||
|
|
||||||
// TODO: AAAA Records
|
// TODO: AAAA Records
|
||||||
if len(r.Records) > 0 {
|
if len(r.Records) > 0 {
|
||||||
|
Loading…
Reference in New Issue
Block a user