diff --git a/Dockerfile b/Dockerfile index 11e8bcf5b6b..c20b4d93ca9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,17 +2,17 @@ FROM golang:1.10.3 as builder # Copy in the go src -WORKDIR /go/src/github.com/platform9/azure-provider +WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-azure COPY pkg/ pkg/ COPY cmd/ cmd/ COPY vendor/ vendor/ # Build -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager github.com/platform9/azure-provider/cmd/manager +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager sigs.k8s.io/cluster-api-provider-azure/cmd/manager # Copy the controller-manager into a thin image FROM alpine:3.8 WORKDIR /root/ -COPY --from=builder /go/src/github.com/platform9/azure-provider/manager . -COPY --from=builder /go/src/github.com/platform9/azure-provider/pkg/cloud/azure/services/resourcemanagement/template/deployment-template.json . +COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/manager . +COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/resourcemanagement/template/deployment-template.json . ENTRYPOINT ["./manager"] diff --git a/Makefile b/Makefile index 695cdef4270..57532ee25cf 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Image URL to use all building/pushing image targets -PREFIX = platform9 +PREFIX ?= platform9 NAME = cluster-api-azure-provider-controller TAG ?= latest IMG=${PREFIX}/${NAME}:${TAG} @@ -25,11 +25,11 @@ cluster-unit-tests: # Build manager binary manager: generate fmt vet - go build -o bin/manager github.com/platform9/azure-provider/cmd/manager + go build -o bin/manager sigs.k8s.io/cluster-api-provider-azure/cmd/manager # Build clusterctl clusterctl: generate fmt vet - go build -o bin/clusterctl github.com/platform9/azure-provider/cmd/clusterctl + go build -o bin/clusterctl sigs.k8s.io/cluster-api-provider-azure/cmd/clusterctl # Run against the configured Kubernetes cluster in ~/.kube/config run: generate fmt vet diff --git a/PROJECT b/PROJECT index 7315cf1d4c0..07c15a9e17f 100644 --- a/PROJECT +++ b/PROJECT @@ -1,3 +1,3 @@ version: "1" domain: k8s.io -repo: github.com/platform9/azure-provider +repo: sigs.k8s.io/cluster-api-provider-azure diff --git a/README.md b/README.md index f1d91324bd8..7d2a483f06b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Kubernetes Cluster API Azure Provider [![Build Status](https://dev.azure.com/Cluster-API-Provider-Azure/Cluster-API-Provider-Azure%20Project/_apis/build/status/platform9.azure-provider)](https://dev.azure.com/Cluster-API-Provider-Azure/Cluster-API-Provider-Azure%20Project/_build/latest?definitionId=1)[![Go Report Card](https://goreportcard.com/badge/github.com/platform9/azure-provider)](https://goreportcard.com/report/github.com/platform9/azure-provider) +# Kubernetes Cluster API Azure Provider [![Build Status](https://dev.azure.com/Cluster-API-Provider-Azure/Cluster-API-Provider-Azure%20Project/_apis/build/status/platform9.azure-provider)](https://dev.azure.com/Cluster-API-Provider-Azure/Cluster-API-Provider-Azure%20Project/_build/latest?definitionId=1)[![Go Report Card](https://goreportcard.com/badge/sigs.k8s.io/cluster-api-provider-azure)](https://goreportcard.com/report/sigs.k8s.io/cluster-api-provider-azure) ## Getting Started ### Prerequisites diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a8013f3b499..3876012b141 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ variables: - name: GOPATH # Go workspace path value: '$(system.defaultWorkingDirectory)/gopath' - name: modulePath # Path to the module's code - value: '$(GOPATH)/src/github.com/platform9/azure-provider' + value: '$(GOPATH)/src/sigs.k8s.io/cluster-api-provider-azure' - name: KubernetesVersion value: 'v1.12.2' - name: KustomizeVersion diff --git a/ci/azure-pipelines-e2e.yml b/ci/azure-pipelines-e2e.yml index cb16a2d9953..2aba13e5e0b 100644 --- a/ci/azure-pipelines-e2e.yml +++ b/ci/azure-pipelines-e2e.yml @@ -164,7 +164,7 @@ steps: - script: | echo "Running e2e test cases" - go test github.com/platform9/azure-provider/test/e2e -test.timeout 0 -v + go test sigs.k8s.io/cluster-api-provider-azure/test/e2e -test.timeout 0 -v env: AZURE_SUBSCRIPTION_ID: $(AZURE_SUBSCRIPTION_ID) AZURE_CLIENT_ID: $(AZURE_CLIENT_ID) diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index b315fe659bb..6890202e1dd 100644 --- a/config/default/manager_image_patch.yaml +++ b/config/default/manager_image_patch.yaml @@ -7,5 +7,5 @@ spec: template: spec: containers: - - image: platform9/cluster-api-azure-provider-controller:latest + - image: jpangms/cluster-api-azure-provider-controller:latest name: manager diff --git a/test/e2e/azure.go b/test/e2e/azure.go index 5d22c29fea3..f75543dd8c1 100644 --- a/test/e2e/azure.go +++ b/test/e2e/azure.go @@ -2,10 +2,10 @@ package e2e import ( "github.com/Azure/go-autorest/autorest/azure/auth" - "github.com/platform9/azure-provider/pkg/cloud/azure/services" - "github.com/platform9/azure-provider/pkg/cloud/azure/services/compute" - "github.com/platform9/azure-provider/pkg/cloud/azure/services/network" - "github.com/platform9/azure-provider/pkg/cloud/azure/services/resourcemanagement" + "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services" + "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/compute" + "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/network" + "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/resourcemanagement" ) func NewAzureServicesClient(subscriptionID string) (*services.AzureClients, error) { diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index cd45e88d788..c5a2fcb2847 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -9,9 +9,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/platform9/azure-provider/pkg/cloud/azure/actuators/machine" - "github.com/platform9/azure-provider/pkg/cloud/azure/services" - "github.com/platform9/azure-provider/pkg/cloud/azure/services/resourcemanagement" + "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machine" + "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services" + "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/resourcemanagement" ) // do some testing with the K8s go client