UPSTREAM: <carry>: openshift: Update import path to reflect github/openshift

We are mirroring the API types under machine.openshift.io group. For the sake of transparency we are making this explicit in the import path. This allows both libraries upstream and openshift ot be consumed simultaneously by other tooling. We aim to consilidate back with upstream once there's a relase stable enough

Author: enxebre

BUILD.bazel

@@ -1,7 +1,7 @@
 load("@bazel_gazelle//:def.bzl", "gazelle")
 load("//build:run_in_workspace_with_goroot.bzl", "workspace_binary")
 
-# gazelle:prefix sigs.k8s.io/cluster-api
+# gazelle:prefix github.com/openshift/cluster-api
 # gazelle:proto disable_global
 gazelle(
     name = "gazelle",

Dockerfile

@@ -16,16 +16,16 @@
 FROM golang:1.11.6 as builder
 
 # Copy in the go src
-WORKDIR $GOPATH/src/sigs.k8s.io/cluster-api
+WORKDIR $GOPATH/src/github.com/openshift/cluster-api
 COPY pkg/    pkg/
 COPY cmd/    cmd/
 COPY vendor/ vendor/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -o manager sigs.k8s.io/cluster-api/cmd/manager
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -o manager github.com/openshift/cluster-api/cmd/manager
 
 # Copy the controller-manager into a thin image
 FROM gcr.io/distroless/static:latest
 WORKDIR /
-COPY --from=builder /go/src/sigs.k8s.io/cluster-api/manager .
+COPY --from=builder /go/src/github.com/openshift/cluster-api/manager .
 ENTRYPOINT ["/manager"]

Makefile

@@ -46,11 +46,11 @@ test: gazelle verify generate fmt vet manifests ## Run tests
 
 .PHONY: manager
 manager: generate fmt vet ## Build manager binary
-	go build -o bin/manager sigs.k8s.io/cluster-api/cmd/manager
+	go build -o bin/manager github.com/openshift/cluster-api/cmd/manager
 
 .PHONY: clusterctl
 clusterctl: generate fmt vet ## Build clusterctl binary
-	go build -o bin/clusterctl sigs.k8s.io/cluster-api/cmd/clusterctl
+	go build -o bin/clusterctl github.com/openshift/cluster-api/cmd/clusterctl
 
 .PHONY: run
 run: generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
@@ -92,16 +92,16 @@ generate: clientset dep-ensure ## Generate code
 clientset: ## Generate a typed clientset
 	rm -rf pkg/client
 	cd ./vendor/k8s.io/code-generator/cmd && go install ./client-gen ./lister-gen ./informer-gen
-	$$GOPATH/bin/client-gen --clientset-name clientset --input-base sigs.k8s.io/cluster-api/pkg/apis \
-		--input cluster/v1alpha1,machine/v1beta1 --output-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated \
+	$$GOPATH/bin/client-gen --clientset-name clientset --input-base github.com/openshift/cluster-api/pkg/apis \
+		--input cluster/v1alpha1,machine/v1beta1 --output-package github.com/openshift/cluster-api/pkg/client/clientset_generated \
 		--go-header-file=./hack/boilerplate.go.txt
-	$$GOPATH/bin/lister-gen --input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/machine/v1beta1 \
-		--output-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
+	$$GOPATH/bin/lister-gen --input-dirs github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1,github.com/openshift/cluster-api/pkg/apis/machine/v1beta1 \
+		--output-package github.com/openshift/cluster-api/pkg/client/listers_generated \
 		--go-header-file=./hack/boilerplate.go.txt
-	$$GOPATH/bin/informer-gen --input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/machine/v1beta1 \
-		--versioned-clientset-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset \
-		--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
-		--output-package sigs.k8s.io/cluster-api/pkg/client/informers_generated \
+	$$GOPATH/bin/informer-gen --input-dirs github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1,github.com/openshift/cluster-api/pkg/apis/machine/v1beta1 \
+		--versioned-clientset-package github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset \
+		--listers-package github.com/openshift/cluster-api/pkg/client/listers_generated \
+		--output-package github.com/openshift/cluster-api/pkg/client/informers_generated \
 		--go-header-file=./hack/boilerplate.go.txt
 	$(MAKE) gazelle
 

cmd/clusterctl/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["main.go"],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl",
     visibility = ["//visibility:private"],
     deps = ["//cmd/clusterctl/cmd:go_default_library"],
 )

cmd/clusterctl/clientcmd/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["configutil.go"],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clientcmd",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clientcmd",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/client/clientset_generated/clientset:go_default_library",

cmd/clusterctl/clientcmd/configutil.go

@@ -19,11 +19,11 @@ limitations under the License.
 package clientcmd
 
 import (
+	"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
-	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
 )
 
 // This is a convenience method to prevent the need of importing both this version of clientcmd and the client-go version

cmd/clusterctl/clusterdeployer/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
         "clusterdeployer.go",
         "providercomponentsstorefactory.go",
     ],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer",
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/clusterctl/clusterdeployer/bootstrap:go_default_library",

cmd/clusterctl/clusterdeployer/bootstrap/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
         "options.go",
         "provisioner.go",
     ],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap",
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/clusterctl/clusterdeployer/bootstrap/existing:go_default_library",

cmd/clusterctl/clusterdeployer/bootstrap/existing/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["cluster.go"],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/existing",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/existing",
     visibility = ["//visibility:public"],
     deps = ["//vendor/github.com/pkg/errors:go_default_library"],
 )

cmd/clusterctl/clusterdeployer/bootstrap/kind/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["kind.go"],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/kind",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/kind",
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/pkg/errors:go_default_library",

cmd/clusterctl/clusterdeployer/bootstrap/minikube/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["minikube.go"],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/minikube",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/minikube",
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/pkg/errors:go_default_library",

cmd/clusterctl/clusterdeployer/bootstrap/provisioner.go

@@ -17,10 +17,10 @@ limitations under the License.
 package bootstrap
 
 import (
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/existing"
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/kind"
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/minikube"
 	"github.com/pkg/errors"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/existing"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/kind"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/minikube"
 )
 
 // Can provision a kubernetes cluster

cmd/clusterctl/clusterdeployer/clusterclient/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
         "clientfactory.go",
         "clusterclient.go",
     ],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient",
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/clusterctl/clientcmd:go_default_library",

cmd/clusterctl/clusterdeployer/clusterclient/clientfactory.go

@@ -17,8 +17,8 @@ limitations under the License.
 package clusterclient
 
 import (
+	"github.com/openshift/cluster-api/cmd/clusterctl/clientcmd"
 	"k8s.io/client-go/kubernetes"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clientcmd"
 )
 
 // Factory can create cluster clients.

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

@@ -29,6 +29,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/openshift/cluster-api/cmd/clusterctl/clientcmd"
+	clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
+	"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset"
+	"github.com/openshift/cluster-api/pkg/util"
 	"github.com/pkg/errors"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	apiv1 "k8s.io/api/core/v1"
@@ -37,10 +41,6 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth" // nolint
 	tcmd "k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clientcmd"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
-	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
-	"sigs.k8s.io/cluster-api/pkg/util"
 )
 
 const (

cmd/clusterctl/clusterdeployer/clusterdeployer.go

@@ -20,13 +20,13 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap"
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/provider"
+	"github.com/openshift/cluster-api/cmd/clusterctl/phases"
+	clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
 	"github.com/pkg/errors"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 )
 
 type ClusterDeployer struct {

cmd/clusterctl/clusterdeployer/clusterdeployer_test.go

@@ -22,13 +22,13 @@ import (
 	"os"
 	"testing"
 
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/provider"
+	clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
 	"github.com/pkg/errors"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 )
 
 type testClusterProvisioner struct {
@@ -1066,31 +1066,31 @@ func TestDeleteCleanupExternalCluster(t *testing.T) {
 		expectedErrorMessage   string
 	}{
 		{
-			name:                   "success with cleanup",
+			name: "success with cleanup",
 			cleanupExternalCluster: true,
 			provisionExternalErr:   nil,
 			bootstrapClient:        &testClusterClient{},
 			targetClient:           &testClusterClient{},
 			expectedErrorMessage:   "",
 		},
 		{
-			name:                   "success without cleanup",
+			name: "success without cleanup",
 			cleanupExternalCluster: false,
 			provisionExternalErr:   nil,
 			bootstrapClient:        &testClusterClient{},
 			targetClient:           &testClusterClient{},
 			expectedErrorMessage:   "",
 		},
 		{
-			name:                   "error with cleanup",
+			name: "error with cleanup",
 			cleanupExternalCluster: true,
 			provisionExternalErr:   nil,
 			bootstrapClient:        &testClusterClient{},
 			targetClient:           &testClusterClient{GetMachineSetsErr: errors.New("get machine sets error")},
 			expectedErrorMessage:   "get machine sets error",
 		},
 		{
-			name:                   "error without cleanup",
+			name: "error without cleanup",
 			cleanupExternalCluster: true,
 			provisionExternalErr:   nil,
 			bootstrapClient:        &testClusterClient{},

cmd/clusterctl/clusterdeployer/provider/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["provider.go"],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/provider",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/cluster/v1alpha1:go_default_library",

cmd/clusterctl/clusterdeployer/provider/provider.go

@@ -18,7 +18,7 @@ package provider
 
 import (
 	"k8s.io/client-go/kubernetes"
-	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+	clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
 )
 
 // Deployer is a deprecated interface for Provider specific logic. Please do not extend or add. This interface should be removed

cmd/clusterctl/clusterdeployer/providercomponentsstorefactory.go

@@ -17,9 +17,9 @@ limitations under the License.
 package clusterdeployer
 
 import (
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/provider"
+	"github.com/openshift/cluster-api/cmd/clusterctl/providercomponents"
 	"k8s.io/client-go/kubernetes"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/providercomponents"
 )
 
 type factory struct {

cmd/clusterctl/cmd/BUILD.bazel

@@ -22,7 +22,7 @@ go_library(
         "validate.go",
         "validate_cluster.go",
     ],
-    importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/cmd",
+    importpath = "github.com/openshift/cluster-api/cmd/clusterctl/cmd",
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/clusterctl/clientcmd:go_default_library",

cmd/clusterctl/cmd/alpha_phase_apply_addons.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"io/ioutil"
 
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/phases"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
 )
 
 type AlphaPhaseApplyAddonsOptions struct {

cmd/clusterctl/cmd/alpha_phase_apply_boostrap_components.go

@@ -22,8 +22,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/phases"
 )
 
 type AlphaPhaseApplyBootstrapComponentsOptions struct {

cmd/clusterctl/cmd/alpha_phase_apply_cluster.go

@@ -19,12 +19,12 @@ package cmd
 import (
 	"io/ioutil"
 
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/phases"
+	"github.com/openshift/cluster-api/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
-	"sigs.k8s.io/cluster-api/pkg/util"
 )
 
 type AlphaPhaseApplyClusterOptions struct {

cmd/clusterctl/cmd/alpha_phase_apply_cluster_api_components.go

@@ -19,11 +19,11 @@ package cmd
 import (
 	"io/ioutil"
 
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/phases"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
 )
 
 type AlphaPhaseApplyClusterAPIComponentsOptions struct {

cmd/clusterctl/cmd/alpha_phase_apply_machines.go

@@ -19,12 +19,12 @@ package cmd
 import (
 	"io/ioutil"
 
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/phases"
+	"github.com/openshift/cluster-api/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
-	"sigs.k8s.io/cluster-api/pkg/util"
 )
 
 type AlphaPhaseApplyMachinesOptions struct {

cmd/clusterctl/cmd/alpha_phase_create_bootstrap_cluster.go

@@ -17,12 +17,12 @@ limitations under the License.
 package cmd
 
 import (
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap"
+	"github.com/openshift/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
+	"github.com/openshift/cluster-api/cmd/clusterctl/phases"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
-	"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
 )
 
 type AlphaPhaseCreateBootstrapClusterOptions struct {