Skip to content

Commit

Permalink
Merge f3c22cc into eba1410
Browse files Browse the repository at this point in the history
  • Loading branch information
@tariq1890
tariq1890 committed Dec 31, 2019
2 parents eba1410 + f3c22cc commit bf0b651
Show file tree
Hide file tree
Showing 100 changed files with 261 additions and 250 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Expand Up @@ -15,7 +15,7 @@
# builder image
FROM golang:1.13 as builder

WORKDIR /github.com/kubernetes-sigs/external-dns
WORKDIR /sigs.k8s.io/external-dns

COPY . .
RUN go mod vendor && \
Expand All @@ -29,7 +29,7 @@ LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
RUN apk add --no-cache ca-certificates && \
update-ca-certificates

COPY --from=builder /github.com/kubernetes-sigs/external-dns/build/external-dns /bin/external-dns
COPY --from=builder /sigs.k8s.io/external-dns/build/external-dns /bin/external-dns

# Run as UID for nobody since k8s pod securityContext runAsNonRoot can't resolve the user ID:
# https://github.com/kubernetes/kubernetes/issues/40958
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.mini
View file
Expand Up @@ -14,7 +14,7 @@

FROM golang:1.13 as builder

WORKDIR /github.com/kubernetes-sigs/external-dns
WORKDIR /sigs.k8s.io/external-dns

COPY . .
RUN apt-get update && \
Expand All @@ -27,7 +27,7 @@ RUN apt-get update && \
FROM gcr.io/distroless/static

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=builder /github.com/kubernetes-sigs/external-dns/build/external-dns /bin/external-dns
COPY --from=builder /sigs.k8s.io/external-dns/build/external-dns /bin/external-dns

# Run as UID for nobody since k8s pod securityContext runAsNonRoot can't resolve the user ID:
# https://github.com/kubernetes/kubernetes/issues/40958
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Expand Up @@ -48,7 +48,7 @@ SOURCES = $(shell find . -name '*.go')
IMAGE ?= registry.opensource.zalan.do/teapot/$(BINARY)
VERSION ?= $(shell git describe --tags --always --dirty)
BUILD_FLAGS ?= -v
LDFLAGS ?= -X github.com/kubernetes-sigs/external-dns/pkg/apis/externaldns.Version=$(VERSION) -w -s
LDFLAGS ?= -X sigs.k8s.io/external-dns/pkg/apis/externaldns.Version=$(VERSION) -w -s

build: build/$(BINARY)

Expand Down
8 changes: 4 additions & 4 deletions controller/controller.go
View file
Expand Up @@ -23,10 +23,10 @@ import (
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"

"github.com/kubernetes-sigs/external-dns/plan"
"github.com/kubernetes-sigs/external-dns/provider"
"github.com/kubernetes-sigs/external-dns/registry"
"github.com/kubernetes-sigs/external-dns/source"
"sigs.k8s.io/external-dns/plan"
"sigs.k8s.io/external-dns/provider"
"sigs.k8s.io/external-dns/registry"
"sigs.k8s.io/external-dns/source"
)

var (
Expand Down
10 changes: 5 additions & 5 deletions controller/controller_test.go
View file
Expand Up @@ -22,11 +22,11 @@ import (
"reflect"
"testing"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/internal/testutils"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/kubernetes-sigs/external-dns/provider"
"github.com/kubernetes-sigs/external-dns/registry"
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/internal/testutils"
"sigs.k8s.io/external-dns/plan"
"sigs.k8s.io/external-dns/provider"
"sigs.k8s.io/external-dns/registry"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
@@ -1,4 +1,4 @@
module github.com/kubernetes-sigs/external-dns
module sigs.k8s.io/external-dns

go 1.13

Expand Down
2 changes: 1 addition & 1 deletion internal/testutils/endpoint.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"reflect"
"sort"

"github.com/kubernetes-sigs/external-dns/endpoint"
"sigs.k8s.io/external-dns/endpoint"
)

/** test utility functions for endpoints verifications */
Expand Down
2 changes: 1 addition & 1 deletion internal/testutils/endpoint_test.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"sort"

"github.com/kubernetes-sigs/external-dns/endpoint"
"sigs.k8s.io/external-dns/endpoint"
)

func ExampleSameEndpoints() {
Expand Down
2 changes: 1 addition & 1 deletion internal/testutils/mock_source.go
View file
Expand Up @@ -19,7 +19,7 @@ package testutils
import (
"github.com/stretchr/testify/mock"

"github.com/kubernetes-sigs/external-dns/endpoint"
"sigs.k8s.io/external-dns/endpoint"
)

// MockSource returns mock endpoints.
Expand Down
14 changes: 7 additions & 7 deletions main.go
View file
Expand Up @@ -27,13 +27,13 @@ import (

_ "k8s.io/client-go/plugin/pkg/client/auth"

"github.com/kubernetes-sigs/external-dns/controller"
"github.com/kubernetes-sigs/external-dns/pkg/apis/externaldns"
"github.com/kubernetes-sigs/external-dns/pkg/apis/externaldns/validation"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/kubernetes-sigs/external-dns/provider"
"github.com/kubernetes-sigs/external-dns/registry"
"github.com/kubernetes-sigs/external-dns/source"
"sigs.k8s.io/external-dns/controller"
"sigs.k8s.io/external-dns/pkg/apis/externaldns"
"sigs.k8s.io/external-dns/pkg/apis/externaldns/validation"
"sigs.k8s.io/external-dns/plan"
"sigs.k8s.io/external-dns/provider"
"sigs.k8s.io/external-dns/registry"
"sigs.k8s.io/external-dns/source"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/externaldns/validation/validation.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"errors"
"fmt"

"github.com/kubernetes-sigs/external-dns/pkg/apis/externaldns"
"sigs.k8s.io/external-dns/pkg/apis/externaldns"
)

// ValidateConfig performs validation on the Config object
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/externaldns/validation/validation_test.go
View file
Expand Up @@ -19,7 +19,7 @@ package validation
import (
"testing"

"github.com/kubernetes-sigs/external-dns/pkg/apis/externaldns"
"sigs.k8s.io/external-dns/pkg/apis/externaldns"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion plan/conflict.go
View file
Expand Up @@ -19,7 +19,7 @@ package plan
import (
"sort"

"github.com/kubernetes-sigs/external-dns/endpoint"
"sigs.k8s.io/external-dns/endpoint"
)

// ConflictResolver is used to make a decision in case of two or more different kubernetes resources
Expand Down
3 changes: 2 additions & 1 deletion plan/conflict_test.go
View file
Expand Up @@ -19,8 +19,9 @@ package plan
import (
"testing"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/stretchr/testify/suite"

"sigs.k8s.io/external-dns/endpoint"
)

var _ ConflictResolver = PerResource{}
Expand Down
4 changes: 2 additions & 2 deletions plan/plan.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

"github.com/kubernetes-sigs/external-dns/endpoint"
"sigs.k8s.io/external-dns/endpoint"
)

// Plan can convert a list of desired and current records to a series of create,
Expand Down Expand Up @@ -182,7 +182,7 @@ func shouldUpdateProviderSpecific(desired, current *endpoint.Endpoint) bool {
}
for _, c := range current.ProviderSpecific {
// don't consider target health when detecting changes
// see: https://github.com/kubernetes-sigs/external-dns/issues/869#issuecomment-458576954
// see: https://sigs.k8s.io/external-dns/issues/869#issuecomment-458576954
if c.Name == "aws/evaluate-target-health" {
continue
}
Expand Down
5 changes: 3 additions & 2 deletions plan/plan_test.go
View file
Expand Up @@ -19,10 +19,11 @@ package plan
import (
"testing"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/internal/testutils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/internal/testutils"
)

type PlanTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plan/policy_test.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"reflect"
"testing"

"github.com/kubernetes-sigs/external-dns/endpoint"
"sigs.k8s.io/external-dns/endpoint"
)

// TestApply tests that applying a policy results in the correct set of changes.
Expand Down
5 changes: 3 additions & 2 deletions provider/alibaba_cloud.go
View file
Expand Up @@ -28,10 +28,11 @@ import (
"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
"github.com/aliyun/alibaba-cloud-sdk-go/services/pvtz"
"github.com/denverdino/aliyungo/metadata"
"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
log "github.com/sirupsen/logrus"
yaml "gopkg.in/yaml.v2"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions provider/alibaba_cloud_test.go
View file
Expand Up @@ -22,9 +22,9 @@ import (

"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
"github.com/aliyun/alibaba-cloud-sdk-go/services/pvtz"
"github.com/kubernetes-sigs/external-dns/endpoint"
"sigs.k8s.io/external-dns/endpoint"

"github.com/kubernetes-sigs/external-dns/plan"
"sigs.k8s.io/external-dns/plan"
)

type MockAlibabaCloudDNSAPI struct {
Expand Down
5 changes: 3 additions & 2 deletions provider/aws.go
View file
Expand Up @@ -28,10 +28,11 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/linki/instrumented_http"
log "github.com/sirupsen/logrus"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

const (
Expand Down
7 changes: 4 additions & 3 deletions provider/aws_sd.go
View file
Expand Up @@ -31,11 +31,12 @@ import (
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/session"
sd "github.com/aws/aws-sdk-go/service/servicediscovery"
"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/pkg/apis/externaldns"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/linki/instrumented_http"
log "github.com/sirupsen/logrus"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/pkg/apis/externaldns"
"sigs.k8s.io/external-dns/plan"
)

const (
Expand Down
7 changes: 4 additions & 3 deletions provider/aws_sd_test.go
View file
Expand Up @@ -26,11 +26,12 @@ import (

"github.com/aws/aws-sdk-go/aws"
sd "github.com/aws/aws-sdk-go/service/servicediscovery"
"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/internal/testutils"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/internal/testutils"
"sigs.k8s.io/external-dns/plan"
)

// Compile time check for interface conformance
Expand Down
7 changes: 4 additions & 3 deletions provider/aws_test.go
View file
Expand Up @@ -27,12 +27,13 @@ import (

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/internal/testutils"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/internal/testutils"
"sigs.k8s.io/external-dns/plan"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions provider/azure.go
View file
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/autorest/to"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions provider/azure_private_dns.go
View file
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/Azure/go-autorest/autorest/azure/auth"
"github.com/Azure/go-autorest/autorest/to"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

type azurePrivateDNSConfig struct {
Expand Down
4 changes: 2 additions & 2 deletions provider/azure_privatedns_test.go
View file
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/to"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

// mockPrivateZonesClient implements the methods of the Azure Private DNS Zones Client which are used in the Azure Private DNS Provider
Expand Down
8 changes: 4 additions & 4 deletions provider/azure_test.go
View file
Expand Up @@ -24,11 +24,11 @@ import (
"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/autorest/to"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/internal/testutils"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/stretchr/testify/assert"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/internal/testutils"
"sigs.k8s.io/external-dns/plan"
)

// mockZonesClient implements the methods of the Azure DNS Zones Client which are used in the Azure Provider
Expand Down
6 changes: 3 additions & 3 deletions provider/cloudflare.go
View file
Expand Up @@ -27,9 +27,9 @@ import (
cloudflare "github.com/cloudflare/cloudflare-go"
log "github.com/sirupsen/logrus"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/kubernetes-sigs/external-dns/source"
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
"sigs.k8s.io/external-dns/source"
)

const (
Expand Down
5 changes: 3 additions & 2 deletions provider/cloudflare_test.go
View file
Expand Up @@ -23,10 +23,11 @@ import (
"testing"

cloudflare "github.com/cloudflare/cloudflare-go"
"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

type mockCloudFlareClient struct{}
Expand Down
4 changes: 2 additions & 2 deletions provider/coredns.go
View file
Expand Up @@ -33,8 +33,8 @@ import (
etcdcv3 "github.com/coreos/etcd/clientv3"
log "github.com/sirupsen/logrus"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions provider/coredns_test.go
View file
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"testing"

"github.com/kubernetes-sigs/external-dns/endpoint"
"github.com/kubernetes-sigs/external-dns/plan"
"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
)

const defaultCoreDNSPrefix = "/skydns/"
Expand Down

0 comments on commit bf0b651

Please sign in to comment.