Update to k8c.io/machine-controller (#413)

Signed-off-by: Marko Mudrinić <[email protected]>
kubermatic · Aug 26, 2024 · 0576dcc · 0576dcc
1 parent db37895
commit 0576dcc
Show file tree

Hide file tree

Showing 26 changed files with 47 additions and 47 deletions.
diff --git a/cmd/osm-controller/main.go b/cmd/osm-controller/main.go
@@ -31,7 +31,7 @@ import (
 	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 
-	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
 	"k8c.io/operating-system-manager/pkg/bootstrap"
 	"k8c.io/operating-system-manager/pkg/clusterinfo"
 	"k8c.io/operating-system-manager/pkg/containerruntime"

diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -23,7 +23,7 @@ import (
 	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 
-	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
 	mdmutation "k8c.io/operating-system-manager/pkg/admission/machinedeployment/mutation"
 	oscvalidation "k8c.io/operating-system-manager/pkg/admission/operatingsystemconfig/validation"
 	ospvalidation "k8c.io/operating-system-manager/pkg/admission/operatingsystemprofile/validation"

diff --git a/go.mod b/go.mod
@@ -11,14 +11,14 @@ require (
 	github.com/flatcar/container-linux-config-transpiler v0.9.4
 	github.com/go-logr/zapr v1.3.0
 	github.com/go-test/deep v1.1.1
-	github.com/kubermatic/machine-controller v1.59.1-0.20240821075210-107e3514d267
 	github.com/onsi/ginkgo/v2 v2.20.1
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
 	github.com/sethvargo/go-password v0.3.0
 	github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
 	go.uber.org/zap v1.27.0
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/yaml.v3 v3.0.1
+	k8c.io/machine-controller v1.59.1-0.20240826134918-7051af1be2ce
 	k8c.io/reconciler v0.5.0
 	k8s.io/api v0.31.0
 	k8s.io/apimachinery v0.31.0
@@ -28,7 +28,6 @@ require (
 	k8s.io/utils v0.0.0-20240821151609-f90d01438635
 	sigs.k8s.io/controller-runtime v0.19.0
 	sigs.k8s.io/controller-tools v0.14.0
-	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
@@ -110,6 +109,7 @@ require (
 	k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-20231102161613-e49c8866685a
diff --git a/go.sum b/go.sum
@@ -170,8 +170,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubermatic/machine-controller v1.59.1-0.20240821075210-107e3514d267 h1:l2so0KScg9MeqbGBooF8TQP6lN2HlHxUGBuSsmZe91A=
-github.com/kubermatic/machine-controller v1.59.1-0.20240821075210-107e3514d267/go.mod h1:D5OaF69niQ4wfo8HeHXA0GDYE/rw2Jzy0FAPw4SRcow=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -503,6 +501,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+k8c.io/machine-controller v1.59.1-0.20240826134918-7051af1be2ce h1:xdYbfFTr5WFMNDNwt5P148skkHFJ3BA/gAfpQX11CRY=
+k8c.io/machine-controller v1.59.1-0.20240826134918-7051af1be2ce/go.mod h1:iz5Fx0pR3n3B2wV8IKDcFdovartpzVG5vL3GISGktWo=
 k8c.io/reconciler v0.5.0 h1:BHpelg1UfI/7oBFctqOq8sX6qzflXpl3SlvHe7e8wak=
 k8c.io/reconciler v0.5.0/go.mod h1:pT1+SVcVXJQeBJhpJBXQ5XW64QnKKeYTnVlQf0dGE0k=
 k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=

diff --git a/pkg/admission/machinedeployment/mutation/mutation.go b/pkg/admission/machinedeployment/mutation/mutation.go
@@ -24,8 +24,8 @@ import (
 
 	"go.uber.org/zap"
 
-	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/controllers/osc/resources"
 	"k8c.io/operating-system-manager/pkg/crd/osm/v1alpha1"
 	"k8c.io/operating-system-manager/pkg/generator"

diff --git a/pkg/admission/machinedeployment/mutation/mutation_test.go b/pkg/admission/machinedeployment/mutation/mutation_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/go-test/deep"
 
-	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
+	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/aws/provider.go b/pkg/cloudprovider/aws/provider.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/aws/types"
 	"k8c.io/operating-system-manager/pkg/providerconfig/config"
 )

diff --git a/pkg/cloudprovider/aws/types/types.go b/pkg/cloudprovider/aws/types/types.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package types
 
-import "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+import "k8c.io/machine-controller/pkg/providerconfig/types"
 
 type RawConfig struct {
 	AvailabilityZone types.ConfigVarString `json:"availabilityZone,omitempty"`

diff --git a/pkg/cloudprovider/azure/provider.go b/pkg/cloudprovider/azure/provider.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/azure/types"
 	"k8c.io/operating-system-manager/pkg/providerconfig/config"
 )

diff --git a/pkg/cloudprovider/azure/types/types.go b/pkg/cloudprovider/azure/types/types.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package types
 
-import "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+import "k8c.io/machine-controller/pkg/providerconfig/types"
 
 const AzureCloudProvider = "AZUREPUBLICCLOUD"
 

diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/aws"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/azure"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/gce"

diff --git a/pkg/cloudprovider/gce/provider.go b/pkg/cloudprovider/gce/provider.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 	"fmt"
 
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/gce/types"
 	"k8c.io/operating-system-manager/pkg/providerconfig/config"
 )

diff --git a/pkg/cloudprovider/gce/types/types.go b/pkg/cloudprovider/gce/types/types.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package types
 
-import "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+import "k8c.io/machine-controller/pkg/providerconfig/types"
 
 // RawConfig is a direct representation of an GCE machine object's configuration
 type RawConfig struct {

diff --git a/pkg/cloudprovider/kubevirt/provider.go b/pkg/cloudprovider/kubevirt/provider.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os"
 
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/kubevirt/types"
 	"k8c.io/operating-system-manager/pkg/providerconfig/config"
 

diff --git a/pkg/cloudprovider/kubevirt/types/types.go b/pkg/cloudprovider/kubevirt/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"
 )
 
 type RawConfig struct {

diff --git a/pkg/cloudprovider/openstack/provider.go b/pkg/cloudprovider/openstack/provider.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/openstack/types"
 	"k8c.io/operating-system-manager/pkg/providerconfig/config"
 

diff --git a/pkg/cloudprovider/openstack/types/types.go b/pkg/cloudprovider/openstack/types/types.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package types
 
-import "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+import "k8c.io/machine-controller/pkg/providerconfig/types"
 
 type RawConfig struct {
 	// Auth details

diff --git a/pkg/cloudprovider/vsphere/provider.go b/pkg/cloudprovider/vsphere/provider.go
@@ -23,7 +23,7 @@ import (
 	"net/url"
 	"strings"
 
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/vsphere/types"
 	"k8c.io/operating-system-manager/pkg/providerconfig/config"
 )

diff --git a/pkg/cloudprovider/vsphere/types/types.go b/pkg/cloudprovider/vsphere/types/types.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package types
 
-import "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+import "k8c.io/machine-controller/pkg/providerconfig/types"
 
 type RawConfig struct {
 	TemplateVMName types.ConfigVarString `json:"templateVMName"`

diff --git a/pkg/controllers/osc/osc_controller.go b/pkg/controllers/osc/osc_controller.go
@@ -24,10 +24,10 @@ import (
 
 	"go.uber.org/zap"
 
-	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
-	mcbootstrap "github.com/kubermatic/machine-controller/pkg/bootstrap"
-	machinecontrollerutil "github.com/kubermatic/machine-controller/pkg/controller/util"
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
+	mcbootstrap "k8c.io/machine-controller/pkg/bootstrap"
+	machinecontrollerutil "k8c.io/machine-controller/pkg/controller/util"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/bootstrap"
 	"k8c.io/operating-system-manager/pkg/containerruntime"
 	"k8c.io/operating-system-manager/pkg/controllers/osc/resources"

diff --git a/pkg/controllers/osc/osc_reconciler_test.go b/pkg/controllers/osc/osc_reconciler_test.go
@@ -27,11 +27,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
-	mcbootstrap "github.com/kubermatic/machine-controller/pkg/bootstrap"
-	cloudproviderutil "github.com/kubermatic/machine-controller/pkg/cloudprovider/util"
-	machinecontrollerutil "github.com/kubermatic/machine-controller/pkg/controller/util"
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	"k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
+	mcbootstrap "k8c.io/machine-controller/pkg/bootstrap"
+	cloudproviderutil "k8c.io/machine-controller/pkg/cloudprovider/util"
+	machinecontrollerutil "k8c.io/machine-controller/pkg/controller/util"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/bootstrap"
 	"k8c.io/operating-system-manager/pkg/clusterinfo"
 	"k8c.io/operating-system-manager/pkg/containerruntime"

diff --git a/pkg/controllers/osc/resources/operating_system_config.go b/pkg/controllers/osc/resources/operating_system_config.go
@@ -27,10 +27,10 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/kubermatic/machine-controller/pkg/apis/cluster/common"
-	"github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
-	mcbootstrap "github.com/kubermatic/machine-controller/pkg/bootstrap"
-	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"
+	mcbootstrap "k8c.io/machine-controller/pkg/bootstrap"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider"
 	"k8c.io/operating-system-manager/pkg/containerruntime"
 	osmv1alpha1 "k8c.io/operating-system-manager/pkg/crd/osm/v1alpha1"

diff --git a/pkg/generator/generator.go b/pkg/generator/generator.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"text/template"
 
-	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
-	mcbootstrap "github.com/kubermatic/machine-controller/pkg/bootstrap"
-	"github.com/kubermatic/machine-controller/pkg/jsonutil"
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
+	mcbootstrap "k8c.io/machine-controller/pkg/bootstrap"
+	"k8c.io/machine-controller/pkg/jsonutil"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	osmv1alpha1 "k8c.io/operating-system-manager/pkg/crd/osm/v1alpha1"
 	"k8c.io/operating-system-manager/pkg/providerconfig"
 )

diff --git a/pkg/generator/generator_test.go b/pkg/generator/generator_test.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"testing"
 
-	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
-	mcbootstrap "github.com/kubermatic/machine-controller/pkg/bootstrap"
-	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
+	mcbootstrap "k8c.io/machine-controller/pkg/bootstrap"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/controllers/osc/resources"
 	osmv1alpha1 "k8c.io/operating-system-manager/pkg/crd/osm/v1alpha1"
 

diff --git a/pkg/generator/provisioner.go b/pkg/generator/provisioner.go
@@ -19,9 +19,9 @@ package generator
 import (
 	"fmt"
 
-	clusterv1alpha1 "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"
+	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
+	"k8c.io/machine-controller/pkg/jsonutil"
+	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
 	osmv1alpha1 "k8c.io/operating-system-manager/pkg/crd/osm/v1alpha1"
 	"k8c.io/operating-system-manager/pkg/providerconfig/flatcar"
 )

diff --git a/pkg/providerconfig/config/config.go b/pkg/providerconfig/config/config.go
@@ -19,7 +19,7 @@ package config
 import (
 	"context"
 
-	"github.com/kubermatic/machine-controller/pkg/providerconfig"
+	"k8c.io/machine-controller/pkg/providerconfig"
 
 	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 )