diff --git a/.prow/e2e-features.yaml b/.prow/e2e-features.yaml index 91e6465ed..70c772aff 100644 --- a/.prow/e2e-features.yaml +++ b/.prow/e2e-features.yaml @@ -17,6 +17,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-aws: "true" preset-azure: "true" @@ -52,6 +53,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-openstack: "true" preset-hetzner: "true" @@ -82,6 +84,7 @@ presubmits: # run_if_changed: "(pkg/cloudprovider/provider/openstack/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-openstack: "true" preset-hetzner: "true" @@ -110,6 +113,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" diff --git a/.prow/postsubmits.yaml b/.prow/postsubmits.yaml index 9fe30cd6a..76efda442 100644 --- a/.prow/postsubmits.yaml +++ b/.prow/postsubmits.yaml @@ -17,6 +17,7 @@ postsubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller branches: - ^main$ # Match on tags @@ -48,6 +49,7 @@ postsubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller branches: - ^main$ labels: diff --git a/.prow/provider-alibaba.yaml b/.prow/provider-alibaba.yaml index 918e28af9..65dbbe73b 100644 --- a/.prow/provider-alibaba.yaml +++ b/.prow/provider-alibaba.yaml @@ -18,6 +18,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller max_concurrency: 1 labels: preset-alibaba: "true" diff --git a/.prow/provider-anexia.yaml b/.prow/provider-anexia.yaml index 0ccb25085..f38501d29 100644 --- a/.prow/provider-anexia.yaml +++ b/.prow/provider-anexia.yaml @@ -21,6 +21,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" diff --git a/.prow/provider-aws.yaml b/.prow/provider-aws.yaml index d478420a6..d6346e774 100644 --- a/.prow/provider-aws.yaml +++ b/.prow/provider-aws.yaml @@ -18,6 +18,7 @@ presubmits: # run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-aws: "true" preset-hetzner: "true" @@ -51,6 +52,7 @@ presubmits: # run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-aws: "true" preset-hetzner: "true" @@ -83,6 +85,7 @@ presubmits: # run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-aws: "true" preset-hetzner: "true" @@ -115,6 +118,7 @@ presubmits: # run_if_changed: "(pkg/cloudprovider/provider/aws/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-aws: "true" preset-hetzner: "true" @@ -147,6 +151,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-aws: "true" preset-hetzner: "true" @@ -178,6 +183,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-aws-assume-role: "true" preset-hetzner: "true" diff --git a/.prow/provider-azure.yaml b/.prow/provider-azure.yaml index 6413dc422..e2819e0ba 100644 --- a/.prow/provider-azure.yaml +++ b/.prow/provider-azure.yaml @@ -17,6 +17,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/azure/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-azure: "true" preset-hetzner: "true" @@ -49,6 +50,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/azure/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-azure: "true" preset-hetzner: "true" @@ -82,6 +84,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-azure: "true" preset-hetzner: "true" diff --git a/.prow/provider-digitalocean.yaml b/.prow/provider-digitalocean.yaml index 31b383d96..56471a0d7 100644 --- a/.prow/provider-digitalocean.yaml +++ b/.prow/provider-digitalocean.yaml @@ -17,6 +17,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/digitalocean/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-digitalocean: "true" preset-hetzner: "true" diff --git a/.prow/provider-equinix-metal.yaml b/.prow/provider-equinix-metal.yaml index 3214bec42..e56ddb1cd 100644 --- a/.prow/provider-equinix-metal.yaml +++ b/.prow/provider-equinix-metal.yaml @@ -18,6 +18,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/equinixmetal/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" diff --git a/.prow/provider-gcp.yaml b/.prow/provider-gcp.yaml index db96bab7e..c17f705a4 100644 --- a/.prow/provider-gcp.yaml +++ b/.prow/provider-gcp.yaml @@ -17,6 +17,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-gce: "true" preset-hetzner: "true" diff --git a/.prow/provider-hetzner.yaml b/.prow/provider-hetzner.yaml index 68e93701e..efc74599a 100644 --- a/.prow/provider-hetzner.yaml +++ b/.prow/provider-hetzner.yaml @@ -17,6 +17,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/hetzner/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" diff --git a/.prow/provider-kubevirt.yaml b/.prow/provider-kubevirt.yaml index ba1110a2e..f5463e98f 100644 --- a/.prow/provider-kubevirt.yaml +++ b/.prow/provider-kubevirt.yaml @@ -17,6 +17,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/kubevirt/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller max_concurrency: 1 labels: preset-kubevirt: "true" diff --git a/.prow/provider-linode.yaml b/.prow/provider-linode.yaml index 47b4e01fd..3ef294ee7 100644 --- a/.prow/provider-linode.yaml +++ b/.prow/provider-linode.yaml @@ -18,6 +18,7 @@ presubmits: optional: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" diff --git a/.prow/provider-nutanix.yaml b/.prow/provider-nutanix.yaml index 748655019..6c1909d78 100644 --- a/.prow/provider-nutanix.yaml +++ b/.prow/provider-nutanix.yaml @@ -17,6 +17,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/nutanix/)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" diff --git a/.prow/provider-openstack.yaml b/.prow/provider-openstack.yaml index 00fa7ad29..aaa20bbd1 100644 --- a/.prow/provider-openstack.yaml +++ b/.prow/provider-openstack.yaml @@ -18,6 +18,7 @@ presubmits: # run_if_changed: "(pkg/cloudprovider/provider/openstack/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-openstack: "true" preset-hetzner: "true" @@ -51,6 +52,7 @@ presubmits: # run_if_changed: "(pkg/cloudprovider/provider/openstack/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-openstack: "true" preset-hetzner: "true" diff --git a/.prow/provider-scaleway.yaml b/.prow/provider-scaleway.yaml index d31118f03..10fea9e33 100644 --- a/.prow/provider-scaleway.yaml +++ b/.prow/provider-scaleway.yaml @@ -17,6 +17,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-scaleway: "true" preset-hetzner: "true" diff --git a/.prow/provider-vmware-cloud-director.yaml b/.prow/provider-vmware-cloud-director.yaml index 2b58d1000..e5259a8b0 100644 --- a/.prow/provider-vmware-cloud-director.yaml +++ b/.prow/provider-vmware-cloud-director.yaml @@ -19,6 +19,7 @@ presubmits: # Please check: https://github.com/kubermatic/machine-controller/issues/1619 optional: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller run_if_changed: "(pkg/cloudprovider/provider/vmwareclouddirector/)" labels: preset-vcloud-director: "true" diff --git a/.prow/provider-vsphere.yaml b/.prow/provider-vsphere.yaml index 622721b44..8ba485055 100644 --- a/.prow/provider-vsphere.yaml +++ b/.prow/provider-vsphere.yaml @@ -17,6 +17,7 @@ presubmits: run_if_changed: "(pkg/cloudprovider/provider/vsphere/|pkg/userdata)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" @@ -49,6 +50,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-vsphere: "true" preset-rhel: "true" @@ -81,6 +83,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-vsphere: "true" preset-rhel: "true" @@ -113,6 +116,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" @@ -145,6 +149,7 @@ presubmits: always_run: false decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-hetzner: "true" preset-e2e-ssh: "true" diff --git a/.prow/verify.yaml b/.prow/verify.yaml index 915ab182e..5e9b21719 100644 --- a/.prow/verify.yaml +++ b/.prow/verify.yaml @@ -17,6 +17,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-goproxy: "true" spec: @@ -38,6 +39,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-goproxy: "true" spec: @@ -59,6 +61,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-goproxy: "true" spec: @@ -79,6 +82,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-goproxy: "true" spec: @@ -100,6 +104,7 @@ presubmits: run_if_changed: "^hack/" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller spec: containers: - image: quay.io/kubermatic/build:go-1.23-node-20-0 @@ -128,6 +133,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller spec: containers: - image: quay.io/kubermatic/build:go-1.23-node-20-0 @@ -145,6 +151,7 @@ presubmits: run_if_changed: "^go.(mod|sum)$" decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-goproxy: "true" spec: @@ -161,6 +168,7 @@ presubmits: always_run: true decorate: true clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git" + path_alias: k8c.io/machine-controller labels: preset-goproxy: "true" spec: diff --git a/Dockerfile b/Dockerfile index b8c22b311..0cf006c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG GO_VERSION=1.23.0 FROM docker.io/golang:${GO_VERSION} AS builder -WORKDIR /go/src/github.com/kubermatic/machine-controller +WORKDIR /go/src/k8c.io/machine-controller COPY . . RUN make all @@ -23,7 +23,7 @@ FROM alpine:3.19 RUN apk add --no-cache ca-certificates cdrkit COPY --from=builder \ - /go/src/github.com/kubermatic/machine-controller/machine-controller \ - /go/src/github.com/kubermatic/machine-controller/webhook \ + /go/src/k8c.io/machine-controller/machine-controller \ + /go/src/k8c.io/machine-controller/webhook \ /usr/local/bin/ USER nobody diff --git a/Makefile b/Makefile index 9ed60e822..7bd67c081 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ build-machine-controller: machine-controller GOOS=$(GOOS) go build -v \ $(LDFLAGS) \ -o $@ \ - github.com/kubermatic/machine-controller/cmd/$* + k8c.io/machine-controller/cmd/$* .PHONY: clean clean: @@ -81,10 +81,10 @@ docker-image-publish: docker-image .PHONY: test-unit-docker test-unit-docker: @docker run --rm \ - -v $$PWD:/go/src/github.com/kubermatic/machine-controller \ + -v $$PWD:/go/src/k8c.io/machine-controller \ -v $$PWD/.buildcache:/cache \ -e GOCACHE=/cache \ - -w /go/src/github.com/kubermatic/machine-controller \ + -w /go/src/k8c.io/machine-controller \ golang:$(GO_VERSION) \ make test-unit "GOFLAGS=$(GOFLAGS)" diff --git a/cmd/machine-controller/main.go b/cmd/machine-controller/main.go index 8926b61c8..6e1d25a90 100644 --- a/cmd/machine-controller/main.go +++ b/cmd/machine-controller/main.go @@ -30,19 +30,19 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1/migrations" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - clusterinfo "github.com/kubermatic/machine-controller/pkg/clusterinfo" - machinecontroller "github.com/kubermatic/machine-controller/pkg/controller/machine" - machinedeploymentcontroller "github.com/kubermatic/machine-controller/pkg/controller/machinedeployment" - machinesetcontroller "github.com/kubermatic/machine-controller/pkg/controller/machineset" - "github.com/kubermatic/machine-controller/pkg/controller/nodecsrapprover" - "github.com/kubermatic/machine-controller/pkg/health" - machinecontrollerlog "github.com/kubermatic/machine-controller/pkg/log" - machinesv1alpha1 "github.com/kubermatic/machine-controller/pkg/machines/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/node" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1/migrations" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + clusterinfo "k8c.io/machine-controller/pkg/clusterinfo" + machinecontroller "k8c.io/machine-controller/pkg/controller/machine" + machinedeploymentcontroller "k8c.io/machine-controller/pkg/controller/machinedeployment" + machinesetcontroller "k8c.io/machine-controller/pkg/controller/machineset" + "k8c.io/machine-controller/pkg/controller/nodecsrapprover" + "k8c.io/machine-controller/pkg/health" + machinecontrollerlog "k8c.io/machine-controller/pkg/log" + machinesv1alpha1 "k8c.io/machine-controller/pkg/machines/v1alpha1" + "k8c.io/machine-controller/pkg/node" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index aecc45282..a041e93e2 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -24,10 +24,10 @@ import ( "github.com/go-logr/zapr" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/admission" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - machinecontrollerlog "github.com/kubermatic/machine-controller/pkg/log" - "github.com/kubermatic/machine-controller/pkg/node" + "k8c.io/machine-controller/pkg/admission" + "k8c.io/machine-controller/pkg/cloudprovider/util" + machinecontrollerlog "k8c.io/machine-controller/pkg/log" + "k8c.io/machine-controller/pkg/node" "k8s.io/client-go/tools/clientcmd" ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/docs/howto-provider.md b/docs/howto-provider.md index 886620ae3..b6bc583d1 100644 --- a/docs/howto-provider.md +++ b/docs/howto-provider.md @@ -6,7 +6,7 @@ ### Interface description -The interface a cloud provider has to implement is located in the package `github.com/kubermatic/machine-controller/pkg/cloudprovider/cloud`. It is named `Provider` and defines a small set of functions: +The interface a cloud provider has to implement is located in the package `k8c.io/machine-controller/pkg/cloudprovider/cloud`. It is named `Provider` and defines a small set of functions: ```go AddDefaults(spec v1alpha1.MachineSpec) (v1alpha1.MachineSpec, error) @@ -26,7 +26,7 @@ Get(machine *v1alpha1.Machine) (instance.Instance, error) `Get` gets a node that is associated with the given machine. Note that this method can return a so called _terminal error_, which indicates that a manual interaction is required to recover from this state. See `v1alpha1.MachineStatus` for more info and `errors.TerminalError` type. -In case the instance cannot be found, the returned error has to be `github.com/kubermatic/machine-controller/pkg/cloudprovider/errors.ErrInstanceNotFound` for proper evaluation by the machine controller. +In case the instance cannot be found, the returned error has to be `k8c.io/machine-controller/pkg/cloudprovider/errors.ErrInstanceNotFound` for proper evaluation by the machine controller. ```go Create(machine *v1alpha1.Machine, data *cloud.MachineCreateDeleteData, userdata string) (instance.Instance, error) @@ -60,7 +60,7 @@ SetMetricsForMachines(machines v1alpha1.MachineList) error ### Implementation hints -Provider implementations are located in individual packages in `github.com/kubermatic/machine-controller/pkg/cloudprovider/provider`. Here see e.g. `hetzner` as a straight and good understandable implementation. Other implementations are there too, helping to understand the needed tasks inside and around the `Provider` interface implementation. +Provider implementations are located in individual packages in `k8c.io/machine-controller/pkg/cloudprovider/provider`. Here see e.g. `hetzner` as a straight and good understandable implementation. Other implementations are there too, helping to understand the needed tasks inside and around the `Provider` interface implementation. When retrieving the individual configuration from the provider specification a type for unmarshalling is needed. Here first the provider configuration is read and based on it the individual values of the configuration are retrieved. Typically the access data (token, ID/key combination, document with all information) alternatively can be passed via an environment variable. According methods of the used `providerconfig.ConfigVarResolver` do support this. @@ -69,15 +69,15 @@ For creation of new machines the support of the possible information has to be c ## Integrate provider into the Machine Controller -For each cloud provider a unique string constant has to be defined in file `types.go` in package `github.com/kubermatic/machine-controller/pkg/providerconfig`. Registration based on this constant is done in file `provider.go` in package `github.com/kubermatic/machine-controller/pkg/cloudprovider`. +For each cloud provider a unique string constant has to be defined in file `types.go` in package `k8c.io/machine-controller/pkg/providerconfig`. Registration based on this constant is done in file `provider.go` in package `k8c.io/machine-controller/pkg/cloudprovider`. ## Add example manifest -For documentation of the different configuration options an according example manifest with helpful comments has to be added to `github.com/kubermatic/machine-controller/examples`. Naming scheme is `-machinedeployment.yaml`. +For documentation of the different configuration options an according example manifest with helpful comments has to be added to `k8c.io/machine-controller/examples`. Naming scheme is `-machinedeployment.yaml`. ## Integrate provider into CI -Like the example manifest a more concrete one named `machinedeployment-.yaml` has to be added to `github.com/kubermatic/machine-controller/test/e2e/provisioning/testdata`. Additionally file `all_e2e_test.go` in package `github.com/kubermatic/machine-controller/test/e2e/provisioning` contains all provider tests. Like the existing ones the test for the new provider has to be placed here. Mainly it's the retrieval of test data, especially the access data, from the environment and the starting of the test scenarios. +Like the example manifest a more concrete one named `machinedeployment-.yaml` has to be added to `k8c.io/machine-controller/test/e2e/provisioning/testdata`. Additionally file `all_e2e_test.go` in package `k8c.io/machine-controller/test/e2e/provisioning` contains all provider tests. Like the existing ones the test for the new provider has to be placed here. Mainly it's the retrieval of test data, especially the access data, from the environment and the starting of the test scenarios. Now the provider is ready to be added into the project for CI tests. diff --git a/go.mod b/go.mod index edaed7260..5fd961c75 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kubermatic/machine-controller +module k8c.io/machine-controller go 1.22.0 diff --git a/pkg/admission/admission.go b/pkg/admission/admission.go index 0203c2a96..ddb8b486b 100644 --- a/pkg/admission/admission.go +++ b/pkg/admission/admission.go @@ -31,8 +31,8 @@ import ( "go.uber.org/zap" "gomodules.xyz/jsonpatch/v2" - machinecontroller "github.com/kubermatic/machine-controller/pkg/controller/machine" - "github.com/kubermatic/machine-controller/pkg/node" + machinecontroller "k8c.io/machine-controller/pkg/controller/machine" + "k8c.io/machine-controller/pkg/node" admissionv1 "k8s.io/api/admission/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/admission/machinedeployments.go b/pkg/admission/machinedeployments.go index 7b0b0585a..c380a2b6e 100644 --- a/pkg/admission/machinedeployments.go +++ b/pkg/admission/machinedeployments.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" admissionv1 "k8s.io/api/admission/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/admission/machinedeployments_test.go b/pkg/admission/machinedeployments_test.go index 865be9151..d33146359 100644 --- a/pkg/admission/machinedeployments_test.go +++ b/pkg/admission/machinedeployments_test.go @@ -19,7 +19,7 @@ package admission import ( "testing" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/admission/machinedeployments_validation.go b/pkg/admission/machinedeployments_validation.go index dd4a9c1d6..e2ae84463 100644 --- a/pkg/admission/machinedeployments_validation.go +++ b/pkg/admission/machinedeployments_validation.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" diff --git a/pkg/admission/machines.go b/pkg/admission/machines.go index 379fe0a6e..b564176fc 100644 --- a/pkg/admission/machines.go +++ b/pkg/admission/machines.go @@ -24,11 +24,11 @@ import ( "github.com/Masterminds/semver/v3" "golang.org/x/crypto/ssh" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" admissionv1 "k8s.io/api/admission/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/admission/util.go b/pkg/admission/util.go index 8e95017a4..83124ed4b 100644 --- a/pkg/admission/util.go +++ b/pkg/admission/util.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) const cloudProviderPacket = "packet" diff --git a/pkg/apis/cluster/v1alpha1/conversions/conversions.go b/pkg/apis/cluster/v1alpha1/conversions/conversions.go index d33350b8e..d5a729f9b 100644 --- a/pkg/apis/cluster/v1alpha1/conversions/conversions.go +++ b/pkg/apis/cluster/v1alpha1/conversions/conversions.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - machinesv1alpha1 "github.com/kubermatic/machine-controller/pkg/machines/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + machinesv1alpha1 "k8c.io/machine-controller/pkg/machines/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" @@ -36,7 +36,7 @@ func Convert_MachinesV1alpha1Machine_To_ClusterV1alpha1Machine(in *machinesv1alp out.CreationTimestamp = metav1.Time{} out.ObjectMeta.Namespace = metav1.NamespaceSystem - // github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1.MachineStatus and + // k8c.io/machine-controller/pkg/apis/cluster/v1alpha1.MachineStatus and // pkg/machines/v1alpha1.MachineStatus are semantically identical, the former // only has one additional field, so we cast by serializing and deserializing inStatusJSON, err := json.Marshal(in.Status) diff --git a/pkg/apis/cluster/v1alpha1/conversions/conversions_test.go b/pkg/apis/cluster/v1alpha1/conversions/conversions_test.go index 3ba9ce84e..563b2cdd8 100644 --- a/pkg/apis/cluster/v1alpha1/conversions/conversions_test.go +++ b/pkg/apis/cluster/v1alpha1/conversions/conversions_test.go @@ -23,8 +23,8 @@ import ( "os" "testing" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - machinesv1alpha1 "github.com/kubermatic/machine-controller/pkg/machines/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + machinesv1alpha1 "k8c.io/machine-controller/pkg/machines/v1alpha1" kyaml "k8s.io/apimachinery/pkg/util/yaml" "sigs.k8s.io/yaml" diff --git a/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec.go b/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec.go index d48b19462..eca0097e6 100644 --- a/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec.go +++ b/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec_test.go b/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec_test.go index 902a11cd2..56f906404 100644 --- a/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec_test.go +++ b/pkg/apis/cluster/v1alpha1/conversions/providerconfig_to_providerspec_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - testhelper "github.com/kubermatic/machine-controller/pkg/test" + testhelper "k8c.io/machine-controller/pkg/test" "sigs.k8s.io/yaml" ) diff --git a/pkg/apis/cluster/v1alpha1/defaults.go b/pkg/apis/cluster/v1alpha1/defaults.go index 33be49315..ad61b3313 100644 --- a/pkg/apis/cluster/v1alpha1/defaults.go +++ b/pkg/apis/cluster/v1alpha1/defaults.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/apis/cluster/v1alpha1/doc.go b/pkg/apis/cluster/v1alpha1/doc.go index 1d1025365..3a530de12 100644 --- a/pkg/apis/cluster/v1alpha1/doc.go +++ b/pkg/apis/cluster/v1alpha1/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the cluster v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/kubermatic/machine-controller/pkg/apis/cluster +// +k8s:conversion-gen=k8c.io/machine-controller/pkg/apis/cluster // +k8s:defaulter-gen=TypeMeta // +groupName=cluster.k8s.io package v1alpha1 diff --git a/pkg/apis/cluster/v1alpha1/machine_types.go b/pkg/apis/cluster/v1alpha1/machine_types.go index 4295c340e..01bdb8fb8 100644 --- a/pkg/apis/cluster/v1alpha1/machine_types.go +++ b/pkg/apis/cluster/v1alpha1/machine_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/common" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/cluster/v1alpha1/machinedeployment_types.go b/pkg/apis/cluster/v1alpha1/machinedeployment_types.go index 68aa5410d..110dc9175 100644 --- a/pkg/apis/cluster/v1alpha1/machinedeployment_types.go +++ b/pkg/apis/cluster/v1alpha1/machinedeployment_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/apis/cluster/v1alpha1/machineset_types.go b/pkg/apis/cluster/v1alpha1/machineset_types.go index dadf49d07..2bce745e5 100644 --- a/pkg/apis/cluster/v1alpha1/machineset_types.go +++ b/pkg/apis/cluster/v1alpha1/machineset_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "log" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" diff --git a/pkg/apis/cluster/v1alpha1/migrations/migrations.go b/pkg/apis/cluster/v1alpha1/migrations/migrations.go index 08b70244a..f2e3e2f3a 100644 --- a/pkg/apis/cluster/v1alpha1/migrations/migrations.go +++ b/pkg/apis/cluster/v1alpha1/migrations/migrations.go @@ -24,16 +24,16 @@ import ( "go.uber.org/zap" - machinecontrolleradmission "github.com/kubermatic/machine-controller/pkg/admission" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1/conversions" - "github.com/kubermatic/machine-controller/pkg/cloudprovider" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - machinecontroller "github.com/kubermatic/machine-controller/pkg/controller/machine" - "github.com/kubermatic/machine-controller/pkg/machines" - machinesv1alpha1 "github.com/kubermatic/machine-controller/pkg/machines/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + machinecontrolleradmission "k8c.io/machine-controller/pkg/admission" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1/conversions" + "k8c.io/machine-controller/pkg/cloudprovider" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + machinecontroller "k8c.io/machine-controller/pkg/controller/machine" + "k8c.io/machine-controller/pkg/machines" + machinesv1alpha1 "k8c.io/machine-controller/pkg/machines/v1alpha1" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/pkg/apis/cluster/v1alpha1/register.go b/pkg/apis/cluster/v1alpha1/register.go index ce0eeac3e..f6fd7b6db 100644 --- a/pkg/apis/cluster/v1alpha1/register.go +++ b/pkg/apis/cluster/v1alpha1/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the cluster v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/kubermatic/machine-controller/pkg/apis/cluster +// +k8s:conversion-gen=k8c.io/machine-controller/pkg/apis/cluster // +k8s:defaulter-gen=TypeMeta // +groupName=cluster.k8s.io package v1alpha1 diff --git a/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go index 9c64da837..e9a7bd9eb 100644 --- a/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - common "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" + common "k8c.io/machine-controller/pkg/apis/cluster/common" v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/cloudprovider/cache/cloudprovidercache.go b/pkg/cloudprovider/cache/cloudprovidercache.go index 7b2c576fe..8254ffd1a 100644 --- a/pkg/cloudprovider/cache/cloudprovidercache.go +++ b/pkg/cloudprovider/cache/cloudprovidercache.go @@ -24,7 +24,7 @@ import ( gocache "github.com/patrickmn/go-cache" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" ) type CloudproviderCache struct { diff --git a/pkg/cloudprovider/cache/cloudprovidercache_test.go b/pkg/cloudprovider/cache/cloudprovidercache_test.go index 1f948642c..9d8b0d7eb 100644 --- a/pkg/cloudprovider/cache/cloudprovidercache_test.go +++ b/pkg/cloudprovider/cache/cloudprovidercache_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/errors/errors.go b/pkg/cloudprovider/errors/errors.go index d0df77409..81b9c55ea 100644 --- a/pkg/cloudprovider/errors/errors.go +++ b/pkg/cloudprovider/errors/errors.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/common" ) var ( diff --git a/pkg/cloudprovider/provider.go b/pkg/cloudprovider/provider.go index 4cd794157..23ea1671b 100644 --- a/pkg/cloudprovider/provider.go +++ b/pkg/cloudprovider/provider.go @@ -19,30 +19,30 @@ package cloudprovider import ( "errors" - cloudprovidercache "github.com/kubermatic/machine-controller/pkg/cloudprovider/cache" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/alibaba" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/aws" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/azure" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/digitalocean" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/edge" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/equinixmetal" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/fake" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/gce" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/hetzner" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/kubevirt" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/linode" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/nutanix" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/opennebula" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/openstack" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/scaleway" - vcd "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/vmwareclouddirector" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/vsphere" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/vultr" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + cloudprovidercache "k8c.io/machine-controller/pkg/cloudprovider/cache" + "k8c.io/machine-controller/pkg/cloudprovider/provider/alibaba" + "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia" + "k8c.io/machine-controller/pkg/cloudprovider/provider/aws" + "k8c.io/machine-controller/pkg/cloudprovider/provider/azure" + "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal" + "k8c.io/machine-controller/pkg/cloudprovider/provider/digitalocean" + "k8c.io/machine-controller/pkg/cloudprovider/provider/edge" + "k8c.io/machine-controller/pkg/cloudprovider/provider/equinixmetal" + "k8c.io/machine-controller/pkg/cloudprovider/provider/fake" + "k8c.io/machine-controller/pkg/cloudprovider/provider/gce" + "k8c.io/machine-controller/pkg/cloudprovider/provider/hetzner" + "k8c.io/machine-controller/pkg/cloudprovider/provider/kubevirt" + "k8c.io/machine-controller/pkg/cloudprovider/provider/linode" + "k8c.io/machine-controller/pkg/cloudprovider/provider/nutanix" + "k8c.io/machine-controller/pkg/cloudprovider/provider/opennebula" + "k8c.io/machine-controller/pkg/cloudprovider/provider/openstack" + "k8c.io/machine-controller/pkg/cloudprovider/provider/scaleway" + vcd "k8c.io/machine-controller/pkg/cloudprovider/provider/vmwareclouddirector" + "k8c.io/machine-controller/pkg/cloudprovider/provider/vsphere" + "k8c.io/machine-controller/pkg/cloudprovider/provider/vultr" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) var ( diff --git a/pkg/cloudprovider/provider/alibaba/provider.go b/pkg/cloudprovider/provider/alibaba/provider.go index 0a01c6695..9f7f6a5bc 100644 --- a/pkg/cloudprovider/provider/alibaba/provider.go +++ b/pkg/cloudprovider/provider/alibaba/provider.go @@ -27,16 +27,16 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - alibabatypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/alibaba/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - kuberneteshelper "github.com/kubermatic/machine-controller/pkg/kubernetes" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + alibabatypes "k8c.io/machine-controller/pkg/cloudprovider/provider/alibaba/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + kuberneteshelper "k8c.io/machine-controller/pkg/kubernetes" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/alibaba/types/types.go b/pkg/cloudprovider/provider/alibaba/types/types.go index 9e58cd401..10d1022ef 100644 --- a/pkg/cloudprovider/provider/alibaba/types/types.go +++ b/pkg/cloudprovider/provider/alibaba/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/anexia/helper_test.go b/pkg/cloudprovider/provider/anexia/helper_test.go index eeb4000cf..2936ccb53 100644 --- a/pkg/cloudprovider/provider/anexia/helper_test.go +++ b/pkg/cloudprovider/provider/anexia/helper_test.go @@ -22,12 +22,12 @@ import ( "github.com/gophercloud/gophercloud/testhelper" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - anxtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig/types" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + anxtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/provider/anexia/instance.go b/pkg/cloudprovider/provider/anexia/instance.go index 0c8343b1f..8af72f93c 100644 --- a/pkg/cloudprovider/provider/anexia/instance.go +++ b/pkg/cloudprovider/provider/anexia/instance.go @@ -21,8 +21,8 @@ import ( "go.anx.io/go-anxcloud/pkg/vsphere/info" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - anxtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia/types" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + anxtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia/types" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/cloudprovider/provider/anexia/network_provisioning.go b/pkg/cloudprovider/provider/anexia/network_provisioning.go index 277685d30..963fb6f28 100644 --- a/pkg/cloudprovider/provider/anexia/network_provisioning.go +++ b/pkg/cloudprovider/provider/anexia/network_provisioning.go @@ -21,12 +21,13 @@ import ( "sync" "time" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - anxtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia/types" anxclient "go.anx.io/go-anxcloud/pkg/client" anxaddr "go.anx.io/go-anxcloud/pkg/ipam/address" anxvm "go.anx.io/go-anxcloud/pkg/vsphere/provisioning/vm" "go.uber.org/zap" + + "k8c.io/machine-controller/pkg/apis/cluster/common" + anxtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia/types" ) func networkInterfacesForProvisioning(ctx context.Context, log *zap.SugaredLogger, client anxclient.Client) ([]anxvm.Network, error) { diff --git a/pkg/cloudprovider/provider/anexia/provider.go b/pkg/cloudprovider/provider/anexia/provider.go index 4581fbc20..514c6d6a6 100644 --- a/pkg/cloudprovider/provider/anexia/provider.go +++ b/pkg/cloudprovider/provider/anexia/provider.go @@ -34,16 +34,16 @@ import ( anxvm "go.anx.io/go-anxcloud/pkg/vsphere/provisioning/vm" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/common/ssh" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - anxtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - cloudproviderutil "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/common/ssh" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + anxtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + cloudproviderutil "k8c.io/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" "k8s.io/apimachinery/pkg/api/meta" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/cloudprovider/provider/anexia/provider_test.go b/pkg/cloudprovider/provider/anexia/provider_test.go index d26546fad..61b6e4ff6 100644 --- a/pkg/cloudprovider/provider/anexia/provider_test.go +++ b/pkg/cloudprovider/provider/anexia/provider_test.go @@ -41,11 +41,11 @@ import ( "go.anx.io/go-anxcloud/pkg/vsphere/provisioning/vm" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - anxtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + anxtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/cloudprovider/provider/anexia/reconcile_context.go b/pkg/cloudprovider/provider/anexia/reconcile_context.go index 2a14d8724..276851a7f 100644 --- a/pkg/cloudprovider/provider/anexia/reconcile_context.go +++ b/pkg/cloudprovider/provider/anexia/reconcile_context.go @@ -19,10 +19,10 @@ package anexia import ( "context" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - anxtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + anxtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type contextKey byte diff --git a/pkg/cloudprovider/provider/anexia/resolve_config.go b/pkg/cloudprovider/provider/anexia/resolve_config.go index fbe146dcf..7dddd112a 100644 --- a/pkg/cloudprovider/provider/anexia/resolve_config.go +++ b/pkg/cloudprovider/provider/anexia/resolve_config.go @@ -26,7 +26,7 @@ import ( corev1 "go.anx.io/go-anxcloud/pkg/apis/core/v1" vspherev1 "go.anx.io/go-anxcloud/pkg/apis/vsphere/v1" - anxtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/anexia/types" + anxtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/anexia/types" ) // resolvedDisk contains the resolved values from types.RawDisk. diff --git a/pkg/cloudprovider/provider/anexia/types/types.go b/pkg/cloudprovider/provider/anexia/types/types.go index 8b7bfdff3..4a6788bc8 100644 --- a/pkg/cloudprovider/provider/anexia/types/types.go +++ b/pkg/cloudprovider/provider/anexia/types/types.go @@ -19,10 +19,10 @@ package types import ( "time" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/cloudprovider/provider/aws/provider.go b/pkg/cloudprovider/provider/aws/provider.go index 26acb7c42..0da17a53b 100644 --- a/pkg/cloudprovider/provider/aws/provider.go +++ b/pkg/cloudprovider/provider/aws/provider.go @@ -38,16 +38,16 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - awstypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/aws/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" - "github.com/kubermatic/machine-controller/pkg/userdata/convert" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + awstypes "k8c.io/machine-controller/pkg/cloudprovider/provider/aws/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/userdata/convert" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/provider/aws/types/types.go b/pkg/cloudprovider/provider/aws/types/types.go index 243eb209c..dae0a56fa 100644 --- a/pkg/cloudprovider/provider/aws/types/types.go +++ b/pkg/cloudprovider/provider/aws/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/azure/create_delete_resources.go b/pkg/cloudprovider/provider/azure/create_delete_resources.go index f98c76304..9b57d9d50 100644 --- a/pkg/cloudprovider/provider/azure/create_delete_resources.go +++ b/pkg/cloudprovider/provider/azure/create_delete_resources.go @@ -26,7 +26,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/cloudprovider/util" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/cloudprovider/provider/azure/provider.go b/pkg/cloudprovider/provider/azure/provider.go index f5ec24fa7..1289c3aa2 100644 --- a/pkg/cloudprovider/provider/azure/provider.go +++ b/pkg/cloudprovider/provider/azure/provider.go @@ -33,17 +33,17 @@ import ( gocache "github.com/patrickmn/go-cache" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/common/ssh" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - azuretypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/azure/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - kuberneteshelper "github.com/kubermatic/machine-controller/pkg/kubernetes" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/common/ssh" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + azuretypes "k8c.io/machine-controller/pkg/cloudprovider/provider/azure/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + kuberneteshelper "k8c.io/machine-controller/pkg/kubernetes" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/azure/types/types.go b/pkg/cloudprovider/provider/azure/types/types.go index 7b472689e..12746fb32 100644 --- a/pkg/cloudprovider/provider/azure/types/types.go +++ b/pkg/cloudprovider/provider/azure/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) // RawConfig is a direct representation of an Azure machine object's configuration. diff --git a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/hardware.go b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/hardware.go index f8a39362d..e9ce4695f 100644 --- a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/hardware.go +++ b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/hardware.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - tbtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" tinkv1alpha1 "github.com/tinkerbell/tink/api/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/errors" + tbtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/workflow.go b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/workflow.go index cee68a942..06c0e9a55 100644 --- a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/workflow.go +++ b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client/workflow.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - tink "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" + tink "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" tinkv1alpha1 "github.com/tinkerbell/tink/api/v1alpha1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/driver.go b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/driver.go index 08f44f12e..ea95e78a6 100644 --- a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/driver.go +++ b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/driver.go @@ -20,16 +20,17 @@ import ( "context" "encoding/base64" "fmt" + "github.com/aws/smithy-go/ptr" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" "go.uber.org/zap" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client" - tinktypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" tinkv1alpha1 "github.com/tinkerbell/tink/api/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins" + "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/client" + tinktypes "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/hardware.go b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/hardware.go index 4e124b279..b52434f35 100644 --- a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/hardware.go +++ b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/hardware.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins" tinkv1alpha1 "github.com/tinkerbell/tink/api/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins" ) type Hardware struct { diff --git a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/types.go b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/types.go index fe5d64bed..012300cc5 100644 --- a/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/types.go +++ b/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types/types.go @@ -17,7 +17,7 @@ limitations under the License. package types import ( - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/rest" ) diff --git a/pkg/cloudprovider/provider/baremetal/provider.go b/pkg/cloudprovider/provider/baremetal/provider.go index 0e7cba678..f4e18ed1f 100644 --- a/pkg/cloudprovider/provider/baremetal/provider.go +++ b/pkg/cloudprovider/provider/baremetal/provider.go @@ -24,18 +24,18 @@ import ( "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins" - tink "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell" - tinktypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" - baremetaltypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/baremetal/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins" + tink "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell" + tinktypes "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/plugins/tinkerbell/types" + baremetaltypes "k8c.io/machine-controller/pkg/cloudprovider/provider/baremetal/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/cloudprovider/provider/baremetal/types/types.go b/pkg/cloudprovider/provider/baremetal/types/types.go index 028477859..80feebb40 100644 --- a/pkg/cloudprovider/provider/baremetal/types/types.go +++ b/pkg/cloudprovider/provider/baremetal/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/cloudprovider/provider/digitalocean/provider.go b/pkg/cloudprovider/provider/digitalocean/provider.go index d7e9c9cfd..af82ff6e3 100644 --- a/pkg/cloudprovider/provider/digitalocean/provider.go +++ b/pkg/cloudprovider/provider/digitalocean/provider.go @@ -28,16 +28,16 @@ import ( "go.uber.org/zap" "golang.org/x/oauth2" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/common/ssh" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - digitaloceantypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/digitalocean/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/common/ssh" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + digitaloceantypes "k8c.io/machine-controller/pkg/cloudprovider/provider/digitalocean/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/digitalocean/types/types.go b/pkg/cloudprovider/provider/digitalocean/types/types.go index a0fdb6830..89175c734 100644 --- a/pkg/cloudprovider/provider/digitalocean/types/types.go +++ b/pkg/cloudprovider/provider/digitalocean/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/edge/provider.go b/pkg/cloudprovider/provider/edge/provider.go index 9c4bd2ff9..ed3b2cd98 100644 --- a/pkg/cloudprovider/provider/edge/provider.go +++ b/pkg/cloudprovider/provider/edge/provider.go @@ -21,10 +21,10 @@ import ( "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/equinixmetal/provider.go b/pkg/cloudprovider/provider/equinixmetal/provider.go index 1d197a76e..b4f38f5ae 100644 --- a/pkg/cloudprovider/provider/equinixmetal/provider.go +++ b/pkg/cloudprovider/provider/equinixmetal/provider.go @@ -27,14 +27,14 @@ import ( "github.com/packethost/packngo" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - equinixmetaltypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/equinixmetal/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + equinixmetaltypes "k8c.io/machine-controller/pkg/cloudprovider/provider/equinixmetal/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/provider/equinixmetal/types/types.go b/pkg/cloudprovider/provider/equinixmetal/types/types.go index b34625af0..3cbcbb7dd 100644 --- a/pkg/cloudprovider/provider/equinixmetal/types/types.go +++ b/pkg/cloudprovider/provider/equinixmetal/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/fake/provider.go b/pkg/cloudprovider/provider/fake/provider.go index 67afd2993..219050aff 100644 --- a/pkg/cloudprovider/provider/fake/provider.go +++ b/pkg/cloudprovider/provider/fake/provider.go @@ -23,11 +23,11 @@ import ( "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/gce/config.go b/pkg/cloudprovider/provider/gce/config.go index e23c78b58..739587d44 100644 --- a/pkg/cloudprovider/provider/gce/config.go +++ b/pkg/cloudprovider/provider/gce/config.go @@ -32,10 +32,10 @@ import ( googleoauth "golang.org/x/oauth2/google" "google.golang.org/api/compute/v1" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - gcetypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/gce/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + gcetypes "k8c.io/machine-controller/pkg/cloudprovider/provider/gce/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) // Environment variables for the configuration of the Google Cloud project access. diff --git a/pkg/cloudprovider/provider/gce/instance.go b/pkg/cloudprovider/provider/gce/instance.go index 2b6476195..139556775 100644 --- a/pkg/cloudprovider/provider/gce/instance.go +++ b/pkg/cloudprovider/provider/gce/instance.go @@ -26,7 +26,7 @@ import ( "google.golang.org/api/compute/v1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" + "k8c.io/machine-controller/pkg/cloudprovider/instance" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/cloudprovider/provider/gce/provider.go b/pkg/cloudprovider/provider/gce/provider.go index 3e58ac482..1f18468ad 100644 --- a/pkg/cloudprovider/provider/gce/provider.go +++ b/pkg/cloudprovider/provider/gce/provider.go @@ -33,13 +33,13 @@ import ( compute "google.golang.org/api/compute/v1" "google.golang.org/api/googleapi" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - "github.com/kubermatic/machine-controller/pkg/providerconfig" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/providerconfig" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/cloudprovider/provider/gce/provider_test.go b/pkg/cloudprovider/provider/gce/provider_test.go index cf3de6de7..13ccf5368 100644 --- a/pkg/cloudprovider/provider/gce/provider_test.go +++ b/pkg/cloudprovider/provider/gce/provider_test.go @@ -26,8 +26,8 @@ import ( "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/providerconfig" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/providerconfig" "k8s.io/apimachinery/pkg/runtime" fake2 "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/cloudprovider/provider/gce/types/types.go b/pkg/cloudprovider/provider/gce/types/types.go index 096bc3f88..bb99621fa 100644 --- a/pkg/cloudprovider/provider/gce/types/types.go +++ b/pkg/cloudprovider/provider/gce/types/types.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/cloudprovider/provider/hetzner/provider.go b/pkg/cloudprovider/provider/hetzner/provider.go index 61fdb2284..8b613b007 100644 --- a/pkg/cloudprovider/provider/hetzner/provider.go +++ b/pkg/cloudprovider/provider/hetzner/provider.go @@ -27,15 +27,15 @@ import ( "github.com/hetznercloud/hcloud-go/v2/hcloud" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/common/ssh" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - hetznertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/hetzner/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/common/ssh" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + hetznertypes "k8c.io/machine-controller/pkg/cloudprovider/provider/hetzner/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/hetzner/types/types.go b/pkg/cloudprovider/provider/hetzner/types/types.go index 1148497ae..0312d2a45 100644 --- a/pkg/cloudprovider/provider/hetzner/types/types.go +++ b/pkg/cloudprovider/provider/hetzner/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/kubevirt/provider.go b/pkg/cloudprovider/provider/kubevirt/provider.go index b3cd9e109..3ae9f600a 100644 --- a/pkg/cloudprovider/provider/kubevirt/provider.go +++ b/pkg/cloudprovider/provider/kubevirt/provider.go @@ -31,16 +31,16 @@ import ( kubevirtv1 "kubevirt.io/api/core/v1" cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - kubevirttypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/kubevirt/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - netutil "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - controllerutil "github.com/kubermatic/machine-controller/pkg/controller/util" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + kubevirttypes "k8c.io/machine-controller/pkg/cloudprovider/provider/kubevirt/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + netutil "k8c.io/machine-controller/pkg/cloudprovider/util" + controllerutil "k8c.io/machine-controller/pkg/controller/util" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/cloudprovider/provider/kubevirt/provider_test.go b/pkg/cloudprovider/provider/kubevirt/provider_test.go index 989296bab..0e69d6626 100644 --- a/pkg/cloudprovider/provider/kubevirt/provider_test.go +++ b/pkg/cloudprovider/provider/kubevirt/provider_test.go @@ -28,8 +28,8 @@ import ( kubevirtv1 "kubevirt.io/api/core/v1" cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1" - cloudprovidertesting "github.com/kubermatic/machine-controller/pkg/cloudprovider/testing" - "github.com/kubermatic/machine-controller/pkg/providerconfig" + cloudprovidertesting "k8c.io/machine-controller/pkg/cloudprovider/testing" + "k8c.io/machine-controller/pkg/providerconfig" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/cloudprovider/provider/kubevirt/types/types.go b/pkg/cloudprovider/provider/kubevirt/types/types.go index 0c854d4d9..a46fc88b3 100644 --- a/pkg/cloudprovider/provider/kubevirt/types/types.go +++ b/pkg/cloudprovider/provider/kubevirt/types/types.go @@ -19,8 +19,8 @@ package types import ( kubevirtv1 "kubevirt.io/api/core/v1" - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/cloudprovider/provider/linode/provider.go b/pkg/cloudprovider/provider/linode/provider.go index 628841414..f38e77948 100644 --- a/pkg/cloudprovider/provider/linode/provider.go +++ b/pkg/cloudprovider/provider/linode/provider.go @@ -32,15 +32,15 @@ import ( "go.uber.org/zap" "golang.org/x/oauth2" - common "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/common/ssh" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - linodetypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/linode/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + common "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/common/ssh" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + linodetypes "k8c.io/machine-controller/pkg/cloudprovider/provider/linode/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/linode/types/types.go b/pkg/cloudprovider/provider/linode/types/types.go index f2f2b7ef3..955a8e3da 100644 --- a/pkg/cloudprovider/provider/linode/types/types.go +++ b/pkg/cloudprovider/provider/linode/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/nutanix/client.go b/pkg/cloudprovider/provider/nutanix/client.go index 4394c3b48..205a525a1 100644 --- a/pkg/cloudprovider/provider/nutanix/client.go +++ b/pkg/cloudprovider/provider/nutanix/client.go @@ -28,10 +28,10 @@ import ( nutanixclient "github.com/nutanix-cloud-native/prism-go-client" nutanixv3 "github.com/nutanix-cloud-native/prism-go-client/v3" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - nutanixtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/nutanix/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + nutanixtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/nutanix/types" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/cloudprovider/provider/nutanix/provider.go b/pkg/cloudprovider/provider/nutanix/provider.go index 87f911220..e9a4d6f30 100644 --- a/pkg/cloudprovider/provider/nutanix/provider.go +++ b/pkg/cloudprovider/provider/nutanix/provider.go @@ -25,14 +25,14 @@ import ( "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - nutanixtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/nutanix/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + nutanixtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/nutanix/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" ktypes "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/nutanix/types/types.go b/pkg/cloudprovider/provider/nutanix/types/types.go index a2283b721..e5fe32bde 100644 --- a/pkg/cloudprovider/provider/nutanix/types/types.go +++ b/pkg/cloudprovider/provider/nutanix/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) const ( diff --git a/pkg/cloudprovider/provider/opennebula/provider.go b/pkg/cloudprovider/provider/opennebula/provider.go index 3a2f65da3..da79637ff 100644 --- a/pkg/cloudprovider/provider/opennebula/provider.go +++ b/pkg/cloudprovider/provider/opennebula/provider.go @@ -31,14 +31,14 @@ import ( "github.com/OpenNebula/one/src/oca/go/src/goca/schemas/vm/keys" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - opennebulatypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/opennebula/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + opennebulatypes "k8c.io/machine-controller/pkg/cloudprovider/provider/opennebula/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/opennebula/types/types.go b/pkg/cloudprovider/provider/opennebula/types/types.go index 6e69755fc..51b5f029f 100644 --- a/pkg/cloudprovider/provider/opennebula/types/types.go +++ b/pkg/cloudprovider/provider/opennebula/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/openstack/provider.go b/pkg/cloudprovider/provider/openstack/provider.go index 37d81d02c..861642155 100644 --- a/pkg/cloudprovider/provider/openstack/provider.go +++ b/pkg/cloudprovider/provider/openstack/provider.go @@ -36,15 +36,15 @@ import ( "github.com/gophercloud/gophercloud/pagination" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - openstacktypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/openstack/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - cloudproviderutil "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + openstacktypes "k8c.io/machine-controller/pkg/cloudprovider/provider/openstack/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + cloudproviderutil "k8c.io/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/provider/openstack/provider_test.go b/pkg/cloudprovider/provider/openstack/provider_test.go index b7757b7e8..341791d9c 100644 --- a/pkg/cloudprovider/provider/openstack/provider_test.go +++ b/pkg/cloudprovider/provider/openstack/provider_test.go @@ -32,10 +32,10 @@ import ( "github.com/gophercloud/gophercloud/testhelper/client" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidertesting "github.com/kubermatic/machine-controller/pkg/cloudprovider/testing" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidertesting "k8c.io/machine-controller/pkg/cloudprovider/testing" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/ptr" diff --git a/pkg/cloudprovider/provider/openstack/types/types.go b/pkg/cloudprovider/provider/openstack/types/types.go index 17aed61ee..8d5af36d4 100644 --- a/pkg/cloudprovider/provider/openstack/types/types.go +++ b/pkg/cloudprovider/provider/openstack/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/scaleway/provider.go b/pkg/cloudprovider/provider/scaleway/provider.go index ddd682704..632a6464f 100644 --- a/pkg/cloudprovider/provider/scaleway/provider.go +++ b/pkg/cloudprovider/provider/scaleway/provider.go @@ -27,14 +27,14 @@ import ( "github.com/scaleway/scaleway-sdk-go/validation" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - cloudInstance "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - scalewaytypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/scaleway/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + cloudInstance "k8c.io/machine-controller/pkg/cloudprovider/instance" + scalewaytypes "k8c.io/machine-controller/pkg/cloudprovider/provider/scaleway/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/scaleway/types/types.go b/pkg/cloudprovider/provider/scaleway/types/types.go index 8ecbd5cb1..718f27f11 100644 --- a/pkg/cloudprovider/provider/scaleway/types/types.go +++ b/pkg/cloudprovider/provider/scaleway/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/provider/vmwareclouddirector/client.go b/pkg/cloudprovider/provider/vmwareclouddirector/client.go index c7f6e7878..a628c660f 100644 --- a/pkg/cloudprovider/provider/vmwareclouddirector/client.go +++ b/pkg/cloudprovider/provider/vmwareclouddirector/client.go @@ -26,7 +26,7 @@ import ( "github.com/vmware/go-vcloud-director/v2/govcd" "github.com/vmware/go-vcloud-director/v2/types/v56" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" ) type Client struct { diff --git a/pkg/cloudprovider/provider/vmwareclouddirector/helper.go b/pkg/cloudprovider/provider/vmwareclouddirector/helper.go index bd11b5010..65338e64e 100644 --- a/pkg/cloudprovider/provider/vmwareclouddirector/helper.go +++ b/pkg/cloudprovider/provider/vmwareclouddirector/helper.go @@ -27,7 +27,7 @@ import ( "github.com/vmware/go-vcloud-director/v2/types/v56" vcdapitypes "github.com/vmware/go-vcloud-director/v2/types/v56" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" "k8s.io/utils/ptr" ) diff --git a/pkg/cloudprovider/provider/vmwareclouddirector/provider.go b/pkg/cloudprovider/provider/vmwareclouddirector/provider.go index 7d4888846..3479bfbe5 100644 --- a/pkg/cloudprovider/provider/vmwareclouddirector/provider.go +++ b/pkg/cloudprovider/provider/vmwareclouddirector/provider.go @@ -26,13 +26,13 @@ import ( "github.com/vmware/go-vcloud-director/v2/govcd" "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - vcdtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/vmwareclouddirector/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + vcdtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/vmwareclouddirector/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/provider/vmwareclouddirector/types/types.go b/pkg/cloudprovider/provider/vmwareclouddirector/types/types.go index 1b4cb7b6d..fe60277d3 100644 --- a/pkg/cloudprovider/provider/vmwareclouddirector/types/types.go +++ b/pkg/cloudprovider/provider/vmwareclouddirector/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type IPAllocationMode string diff --git a/pkg/cloudprovider/provider/vsphere/client.go b/pkg/cloudprovider/provider/vsphere/client.go index e1e45b7e9..b706cef05 100644 --- a/pkg/cloudprovider/provider/vsphere/client.go +++ b/pkg/cloudprovider/provider/vsphere/client.go @@ -29,7 +29,7 @@ import ( "github.com/vmware/govmomi/vim25" "github.com/vmware/govmomi/vim25/soap" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/cloudprovider/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) diff --git a/pkg/cloudprovider/provider/vsphere/provider.go b/pkg/cloudprovider/provider/vsphere/provider.go index f5f9a1a0a..4bcd6686a 100644 --- a/pkg/cloudprovider/provider/vsphere/provider.go +++ b/pkg/cloudprovider/provider/vsphere/provider.go @@ -31,14 +31,14 @@ import ( "github.com/vmware/govmomi/vim25/types" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - vspheretypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/vsphere/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + vspheretypes "k8c.io/machine-controller/pkg/cloudprovider/provider/vsphere/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" ktypes "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/vsphere/provider_test.go b/pkg/cloudprovider/provider/vsphere/provider_test.go index 9a30be155..a3e15fef6 100644 --- a/pkg/cloudprovider/provider/vsphere/provider_test.go +++ b/pkg/cloudprovider/provider/vsphere/provider_test.go @@ -27,8 +27,8 @@ import ( "github.com/vmware/govmomi/simulator" "go.uber.org/zap" - cloudprovidertesting "github.com/kubermatic/machine-controller/pkg/cloudprovider/testing" - "github.com/kubermatic/machine-controller/pkg/providerconfig" + cloudprovidertesting "k8c.io/machine-controller/pkg/cloudprovider/testing" + "k8c.io/machine-controller/pkg/providerconfig" "k8s.io/utils/ptr" fakectrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/cloudprovider/provider/vsphere/rule.go b/pkg/cloudprovider/provider/vsphere/rule.go index 98e713ba5..94408dc4b 100644 --- a/pkg/cloudprovider/provider/vsphere/rule.go +++ b/pkg/cloudprovider/provider/vsphere/rule.go @@ -29,7 +29,7 @@ import ( "github.com/vmware/govmomi/vim25/types" "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" "k8s.io/utils/ptr" ) diff --git a/pkg/cloudprovider/provider/vsphere/types/types.go b/pkg/cloudprovider/provider/vsphere/types/types.go index 443cfa137..c8ab0c85a 100644 --- a/pkg/cloudprovider/provider/vsphere/types/types.go +++ b/pkg/cloudprovider/provider/vsphere/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) // RawConfig represents vsphere specific configuration. diff --git a/pkg/cloudprovider/provider/vsphere/vmgroup.go b/pkg/cloudprovider/provider/vsphere/vmgroup.go index 79c87428b..1b51a5468 100644 --- a/pkg/cloudprovider/provider/vsphere/vmgroup.go +++ b/pkg/cloudprovider/provider/vsphere/vmgroup.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" "github.com/vmware/govmomi/vim25/types" "go.uber.org/zap" diff --git a/pkg/cloudprovider/provider/vultr/provider.go b/pkg/cloudprovider/provider/vultr/provider.go index 09e105c4f..f2b3c9698 100644 --- a/pkg/cloudprovider/provider/vultr/provider.go +++ b/pkg/cloudprovider/provider/vultr/provider.go @@ -29,14 +29,14 @@ import ( "go.uber.org/zap" "golang.org/x/oauth2" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - vultrtypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/provider/vultr/types" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + vultrtypes "k8c.io/machine-controller/pkg/cloudprovider/provider/vultr/types" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/provider/vultr/types/types.go b/pkg/cloudprovider/provider/vultr/types/types.go index 278ea6066..e016d6288 100644 --- a/pkg/cloudprovider/provider/vultr/types/types.go +++ b/pkg/cloudprovider/provider/vultr/types/types.go @@ -17,8 +17,8 @@ limitations under the License. package types import ( - "github.com/kubermatic/machine-controller/pkg/jsonutil" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/jsonutil" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) type RawConfig struct { diff --git a/pkg/cloudprovider/testing/testing.go b/pkg/cloudprovider/testing/testing.go index aae583cff..2069f4407 100644 --- a/pkg/cloudprovider/testing/testing.go +++ b/pkg/cloudprovider/testing/testing.go @@ -19,7 +19,7 @@ package testing import ( "testing" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/cloudprovider/types/types.go b/pkg/cloudprovider/types/types.go index 59e90d9d3..c8142d366 100644 --- a/pkg/cloudprovider/types/types.go +++ b/pkg/cloudprovider/types/types.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/instance" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/types" @@ -48,7 +48,7 @@ type Provider interface { // which indicates that a manual interaction is required to recover from this state. // See v1alpha1.MachineStatus for more info and TerminalError type // - // In case the instance cannot be found, github.com/kubermatic/machine-controller/pkg/cloudprovider/errors/ErrInstanceNotFound will be returned + // In case the instance cannot be found, k8c.io/machine-controller/pkg/cloudprovider/errors/ErrInstanceNotFound will be returned Get(ctx context.Context, log *zap.SugaredLogger, machine *clusterv1alpha1.Machine, data *ProviderData) (instance.Instance, error) // Create creates a cloud instance according to the given machine diff --git a/pkg/cloudprovider/util/util.go b/pkg/cloudprovider/util/util.go index 63a15a83b..2bf06bdca 100644 --- a/pkg/cloudprovider/util/util.go +++ b/pkg/cloudprovider/util/util.go @@ -19,9 +19,9 @@ package util import ( "fmt" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - kuberneteshelper "github.com/kubermatic/machine-controller/pkg/kubernetes" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + kuberneteshelper "k8c.io/machine-controller/pkg/kubernetes" ) // RemoveFinalizerOnInstanceNotFound checks whether a finalizer exists and removes it on demand. diff --git a/pkg/cloudprovider/util/util_test.go b/pkg/cloudprovider/util/util_test.go index 1c15707bd..13734a75a 100644 --- a/pkg/cloudprovider/util/util_test.go +++ b/pkg/cloudprovider/util/util_test.go @@ -21,9 +21,9 @@ import ( "reflect" "testing" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cloudprovider/validationwrapper.go b/pkg/cloudprovider/validationwrapper.go index ba6390087..a3bb979a8 100644 --- a/pkg/cloudprovider/validationwrapper.go +++ b/pkg/cloudprovider/validationwrapper.go @@ -23,9 +23,9 @@ import ( "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/machine/controller.go b/pkg/controller/machine/controller.go index 2a24dd29c..87ed6849a 100644 --- a/pkg/controller/machine/controller.go +++ b/pkg/controller/machine/controller.go @@ -31,22 +31,22 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/bootstrap" - "github.com/kubermatic/machine-controller/pkg/cloudprovider" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - controllerutil "github.com/kubermatic/machine-controller/pkg/controller/util" - kuberneteshelper "github.com/kubermatic/machine-controller/pkg/kubernetes" - "github.com/kubermatic/machine-controller/pkg/node/eviction" - "github.com/kubermatic/machine-controller/pkg/node/poddeletion" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" - "github.com/kubermatic/machine-controller/pkg/rhsm" - "github.com/kubermatic/machine-controller/pkg/userdata/rhel" + "k8c.io/machine-controller/pkg/apis/cluster/common" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/bootstrap" + "k8c.io/machine-controller/pkg/cloudprovider" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/cloudprovider/util" + controllerutil "k8c.io/machine-controller/pkg/controller/util" + kuberneteshelper "k8c.io/machine-controller/pkg/kubernetes" + "k8c.io/machine-controller/pkg/node/eviction" + "k8c.io/machine-controller/pkg/node/poddeletion" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/rhsm" + "k8c.io/machine-controller/pkg/userdata/rhel" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/controller/machine/controller_test.go b/pkg/controller/machine/controller_test.go index 0c98c04bc..f505c2434 100644 --- a/pkg/controller/machine/controller_test.go +++ b/pkg/controller/machine/controller_test.go @@ -25,10 +25,10 @@ import ( "github.com/go-test/deep" "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/instance" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/instance" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/machine/metrics.go b/pkg/controller/machine/metrics.go index 8906279d6..b5f681bdb 100644 --- a/pkg/controller/machine/metrics.go +++ b/pkg/controller/machine/metrics.go @@ -23,10 +23,10 @@ import ( "github.com/prometheus/client_golang/prometheus" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" "k8s.io/apimachinery/pkg/api/equality" utilruntime "k8s.io/apimachinery/pkg/util/runtime" diff --git a/pkg/controller/machinedeployment/controller.go b/pkg/controller/machinedeployment/controller.go index 73530f52d..81753d7a4 100644 --- a/pkg/controller/machinedeployment/controller.go +++ b/pkg/controller/machinedeployment/controller.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/machinedeployment/rolling.go b/pkg/controller/machinedeployment/rolling.go index f4cb42676..000fb1ad6 100644 --- a/pkg/controller/machinedeployment/rolling.go +++ b/pkg/controller/machinedeployment/rolling.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - dutil "github.com/kubermatic/machine-controller/pkg/controller/util" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + dutil "k8c.io/machine-controller/pkg/controller/util" "k8s.io/utils/integer" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/machinedeployment/sync.go b/pkg/controller/machinedeployment/sync.go index e9e9f071a..4c10bac48 100644 --- a/pkg/controller/machinedeployment/sync.go +++ b/pkg/controller/machinedeployment/sync.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - dutil "github.com/kubermatic/machine-controller/pkg/controller/util" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + dutil "k8c.io/machine-controller/pkg/controller/util" "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/machineset/controller.go b/pkg/controller/machineset/controller.go index 3290a56bd..000d37179 100644 --- a/pkg/controller/machineset/controller.go +++ b/pkg/controller/machineset/controller.go @@ -28,7 +28,7 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/machineset/delete_policy.go b/pkg/controller/machineset/delete_policy.go index 44fee2cd3..c631a70e5 100644 --- a/pkg/controller/machineset/delete_policy.go +++ b/pkg/controller/machineset/delete_policy.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/machineset/machine.go b/pkg/controller/machineset/machine.go index 8a3cb5d75..7c24891f0 100644 --- a/pkg/controller/machineset/machine.go +++ b/pkg/controller/machineset/machine.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/controller/machineset/status.go b/pkg/controller/machineset/status.go index 0a207835c..0d724816b 100644 --- a/pkg/controller/machineset/status.go +++ b/pkg/controller/machineset/status.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/nodecsrapprover/controller.go b/pkg/controller/nodecsrapprover/controller.go index 97ccb1357..b894ff46b 100644 --- a/pkg/controller/nodecsrapprover/controller.go +++ b/pkg/controller/nodecsrapprover/controller.go @@ -27,7 +27,7 @@ import ( "github.com/go-logr/zapr" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" certificatesv1 "k8s.io/api/certificates/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/nodecsrapprover/controller_test.go b/pkg/controller/nodecsrapprover/controller_test.go index cb71c523f..970045250 100644 --- a/pkg/controller/nodecsrapprover/controller_test.go +++ b/pkg/controller/nodecsrapprover/controller_test.go @@ -22,7 +22,7 @@ import ( "fmt" "testing" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" certificatesv1 "k8s.io/api/certificates/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/util/machine.go b/pkg/controller/util/machine.go index 69a2a833b..848308f9a 100644 --- a/pkg/controller/util/machine.go +++ b/pkg/controller/util/machine.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/util/machine_deployment.go b/pkg/controller/util/machine_deployment.go index 081862b2e..a6b06365a 100644 --- a/pkg/controller/util/machine_deployment.go +++ b/pkg/controller/util/machine_deployment.go @@ -27,8 +27,8 @@ import ( "github.com/davecgh/go-spew/spew" "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/common" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/apis/cluster/common" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" v1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/health/readiness.go b/pkg/health/readiness.go index 8ec6176b6..85081fd42 100644 --- a/pkg/health/readiness.go +++ b/pkg/health/readiness.go @@ -23,7 +23,7 @@ import ( "go.uber.org/zap" - machinecontroller "github.com/kubermatic/machine-controller/pkg/controller/machine" + machinecontroller "k8c.io/machine-controller/pkg/controller/machine" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/pkg/machines/register.go b/pkg/machines/register.go index 64bca258e..76e3f862e 100644 --- a/pkg/machines/register.go +++ b/pkg/machines/register.go @@ -19,7 +19,7 @@ package machines import ( "reflect" - "github.com/kubermatic/machine-controller/pkg/machines/v1alpha1" + "k8c.io/machine-controller/pkg/machines/v1alpha1" ) type resource struct { diff --git a/pkg/node/eviction/eviction.go b/pkg/node/eviction/eviction.go index 9c2b6f1ec..740bafe87 100644 --- a/pkg/node/eviction/eviction.go +++ b/pkg/node/eviction/eviction.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" - evictiontypes "github.com/kubermatic/machine-controller/pkg/node/eviction/types" - "github.com/kubermatic/machine-controller/pkg/node/nodemanager" + evictiontypes "k8c.io/machine-controller/pkg/node/eviction/types" + "k8c.io/machine-controller/pkg/node/nodemanager" corev1 "k8s.io/api/core/v1" policy "k8s.io/api/policy/v1beta1" diff --git a/pkg/node/flags.go b/pkg/node/flags.go index ae8fe17f4..f101a3afb 100644 --- a/pkg/node/flags.go +++ b/pkg/node/flags.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - machinecontroller "github.com/kubermatic/machine-controller/pkg/controller/machine" + machinecontroller "k8c.io/machine-controller/pkg/controller/machine" ) func NewFlags(flagset *flag.FlagSet) *Flags { diff --git a/pkg/node/poddeletion/pod_deletion.go b/pkg/node/poddeletion/pod_deletion.go index af164fda5..bc3af41c4 100644 --- a/pkg/node/poddeletion/pod_deletion.go +++ b/pkg/node/poddeletion/pod_deletion.go @@ -23,7 +23,7 @@ import ( "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/node/nodemanager" + "k8c.io/machine-controller/pkg/node/nodemanager" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/providerconfig/types.go b/pkg/providerconfig/types.go index 511773c81..13d21b0a3 100644 --- a/pkg/providerconfig/types.go +++ b/pkg/providerconfig/types.go @@ -24,13 +24,13 @@ import ( "strconv" "time" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" - "github.com/kubermatic/machine-controller/pkg/userdata/amzn2" - "github.com/kubermatic/machine-controller/pkg/userdata/centos" - "github.com/kubermatic/machine-controller/pkg/userdata/flatcar" - "github.com/kubermatic/machine-controller/pkg/userdata/rhel" - "github.com/kubermatic/machine-controller/pkg/userdata/rockylinux" - "github.com/kubermatic/machine-controller/pkg/userdata/ubuntu" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/userdata/amzn2" + "k8c.io/machine-controller/pkg/userdata/centos" + "k8c.io/machine-controller/pkg/userdata/flatcar" + "k8c.io/machine-controller/pkg/userdata/rhel" + "k8c.io/machine-controller/pkg/userdata/rockylinux" + "k8c.io/machine-controller/pkg/userdata/ubuntu" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/providerconfig/types/types.go b/pkg/providerconfig/types/types.go index 1a6a89640..5ca2a3169 100644 --- a/pkg/providerconfig/types/types.go +++ b/pkg/providerconfig/types/types.go @@ -23,9 +23,9 @@ import ( "fmt" "strconv" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/util" - "github.com/kubermatic/machine-controller/pkg/jsonutil" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/util" + "k8c.io/machine-controller/pkg/jsonutil" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/providerconfig/types_test.go b/pkg/providerconfig/types_test.go index b9abc31ce..344e8ff26 100644 --- a/pkg/providerconfig/types_test.go +++ b/pkg/providerconfig/types_test.go @@ -19,7 +19,7 @@ package providerconfig import ( "testing" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/rhsm/util.go b/pkg/rhsm/util.go index ed45078dc..6e8fcb7a9 100644 --- a/pkg/rhsm/util.go +++ b/pkg/rhsm/util.go @@ -17,9 +17,9 @@ limitations under the License. package rhsm import ( - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - kuberneteshelper "github.com/kubermatic/machine-controller/pkg/kubernetes" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider/types" + kuberneteshelper "k8c.io/machine-controller/pkg/kubernetes" ) const ( diff --git a/test/e2e/provisioning/all_e2e_test.go b/test/e2e/provisioning/all_e2e_test.go index d940442b1..0aa013ed6 100644 --- a/test/e2e/provisioning/all_e2e_test.go +++ b/test/e2e/provisioning/all_e2e_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" - "github.com/kubermatic/machine-controller/pkg/userdata/flatcar" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/userdata/flatcar" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/e2e/provisioning/deploymentscenario.go b/test/e2e/provisioning/deploymentscenario.go index 12933296b..779e9bcad 100644 --- a/test/e2e/provisioning/deploymentscenario.go +++ b/test/e2e/provisioning/deploymentscenario.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" kerrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/provisioning/helper.go b/test/e2e/provisioning/helper.go index a947e17d9..ca42162e8 100644 --- a/test/e2e/provisioning/helper.go +++ b/test/e2e/provisioning/helper.go @@ -27,7 +27,7 @@ import ( "github.com/Masterminds/semver/v3" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" ) var ( diff --git a/test/e2e/provisioning/migrateuidscenario.go b/test/e2e/provisioning/migrateuidscenario.go index d846fa3e9..e443fc856 100644 --- a/test/e2e/provisioning/migrateuidscenario.go +++ b/test/e2e/provisioning/migrateuidscenario.go @@ -25,12 +25,12 @@ import ( "go.uber.org/zap" - "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - "github.com/kubermatic/machine-controller/pkg/cloudprovider" - cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors" - cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types" - "github.com/kubermatic/machine-controller/pkg/providerconfig" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + "k8c.io/machine-controller/pkg/cloudprovider" + cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors" + cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types" + "k8c.io/machine-controller/pkg/providerconfig" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/provisioning/verify.go b/test/e2e/provisioning/verify.go index 1c74cae08..75e005db2 100644 --- a/test/e2e/provisioning/verify.go +++ b/test/e2e/provisioning/verify.go @@ -23,10 +23,10 @@ import ( "strings" "time" - clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" - machinecontroller "github.com/kubermatic/machine-controller/pkg/controller/machine" - evictiontypes "github.com/kubermatic/machine-controller/pkg/node/eviction/types" - providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types" + clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1" + machinecontroller "k8c.io/machine-controller/pkg/controller/machine" + evictiontypes "k8c.io/machine-controller/pkg/node/eviction/types" + providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors"