Skip to content

Commit

Permalink
Update remaining platform9 paths to sigs.k8s.io (#51)
Browse files Browse the repository at this point in the history
  • Loading branch information
juan-lee authored and k8s-ci-robot committed Jan 14, 2019
1 parent 51be9a3 commit e793396
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version: "1"
domain: k8s.io
repo: github.com/platform9/azure-provider
repo: sigs.k8s.io/cluster-api-provider-azure
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/azure-pipelines-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions test/e2e/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e793396

Please sign in to comment.