From 1934fae0be3d2e950232e9edd23327e95f36e0f5 Mon Sep 17 00:00:00 2001 From: killianmuldoon Date: Thu, 31 Aug 2023 10:04:28 +0100 Subject: [PATCH] Remove files and markers for Kubebuilder Signed-off-by: killianmuldoon --- PROJECT | 36 ------------------- bootstrap/kubeadm/PROJECT | 16 --------- bootstrap/kubeadm/main.go | 3 -- controlplane/kubeadm/PROJECT | 19 ---------- controlplane/kubeadm/main.go | 3 -- exp/PROJECT | 10 ------ exp/addons/PROJECT | 14 -------- exp/addons/internal/controllers/suite_test.go | 1 - exp/internal/controllers/suite_test.go | 1 - internal/controllers/cluster/suite_test.go | 1 - internal/controllers/machine/suite_test.go | 1 - .../machinedeployment/suite_test.go | 1 - .../machinehealthcheck/suite_test.go | 1 - internal/controllers/machineset/suite_test.go | 1 - main.go | 3 -- test/infrastructure/docker/PROJECT | 34 ------------------ test/infrastructure/docker/exp/PROJECT | 13 ------- test/infrastructure/docker/main.go | 3 -- test/infrastructure/inmemory/main.go | 1 - 19 files changed, 162 deletions(-) delete mode 100644 PROJECT delete mode 100644 bootstrap/kubeadm/PROJECT delete mode 100644 controlplane/kubeadm/PROJECT delete mode 100644 exp/PROJECT delete mode 100644 exp/addons/PROJECT delete mode 100644 test/infrastructure/docker/PROJECT delete mode 100644 test/infrastructure/docker/exp/PROJECT diff --git a/PROJECT b/PROJECT deleted file mode 100644 index b93fe233d906..000000000000 --- a/PROJECT +++ /dev/null @@ -1,36 +0,0 @@ -domain: x-k8s.io -repo: sigs.k8s.io/cluster-api -resources: -# v1alpha4 types -- group: cluster - kind: ClusterClass - version: v1alpha4 -- group: cluster - kind: Cluster - version: v1alpha4 -- group: cluster - kind: Machine - version: v1alpha4 -- group: cluster - kind: MachineSet - version: v1alpha4 -- group: cluster - kind: MachineDeployment - version: v1alpha4 -# v1beta1 types -- group: cluster - kind: ClusterClass - version: v1beta1 -- group: cluster - kind: Cluster - version: v1beta1 -- group: cluster - kind: Machine - version: v1beta1 -- group: cluster - kind: MachineSet - version: v1beta1 -- group: cluster - kind: MachineDeployment - version: v1beta1 -version: "2" diff --git a/bootstrap/kubeadm/PROJECT b/bootstrap/kubeadm/PROJECT deleted file mode 100644 index 88db42f29a5c..000000000000 --- a/bootstrap/kubeadm/PROJECT +++ /dev/null @@ -1,16 +0,0 @@ -version: "2" -domain: cluster.x-k8s.io -repo: sigs.k8s.io/cluster-api/bootstrap/kubeadm -resources: -- group: bootstrap - version: v1alpha4 - kind: KubeadmConfig -- group: bootstrap - version: v1alpha4 - kind: KubeadmConfigTemplate -- group: bootstrap - version: v1beta1 - kind: KubeadmConfig -- group: bootstrap - version: v1beta1 - kind: KubeadmConfigTemplate diff --git a/bootstrap/kubeadm/main.go b/bootstrap/kubeadm/main.go index a3d3dffc642d..c92ba43e640c 100644 --- a/bootstrap/kubeadm/main.go +++ b/bootstrap/kubeadm/main.go @@ -25,7 +25,6 @@ import ( goruntime "runtime" "time" - // +kubebuilder:scaffold:imports "github.com/spf13/pflag" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" @@ -70,7 +69,6 @@ func init() { _ = expv1.AddToScheme(scheme) _ = bootstrapv1alpha4.AddToScheme(scheme) _ = bootstrapv1.AddToScheme(scheme) - // +kubebuilder:scaffold:scheme } var ( @@ -263,7 +261,6 @@ func main() { setupWebhooks(mgr) setupReconcilers(ctx, mgr) - // +kubebuilder:scaffold:builder setupLog.Info("starting manager", "version", version.Get().String()) if err := mgr.Start(ctx); err != nil { setupLog.Error(err, "problem running manager") diff --git a/controlplane/kubeadm/PROJECT b/controlplane/kubeadm/PROJECT deleted file mode 100644 index 57a40a5509d2..000000000000 --- a/controlplane/kubeadm/PROJECT +++ /dev/null @@ -1,19 +0,0 @@ -version: "2" -domain: controlplane.cluster.x-k8s.io -repo: sigs.k8s.io/cluster-api/controlplane/kubeadm -resources: -- group: controlplane - version: v1alpha3 - kind: KubeadmControlPlane -- group: controlplane - version: v1alpha4 - kind: KubeadmControlPlane -- group: controlplane - kind: KubeadmControlPlaneTemplate - version: v1alpha4 -- group: controlplane - version: v1beta1 - kind: KubeadmControlPlane -- group: controlplane - kind: KubeadmControlPlaneTemplate - version: v1beta1 diff --git a/controlplane/kubeadm/main.go b/controlplane/kubeadm/main.go index 49bc4f3f21d6..ada11277e0dd 100644 --- a/controlplane/kubeadm/main.go +++ b/controlplane/kubeadm/main.go @@ -25,7 +25,6 @@ import ( goruntime "runtime" "time" - // +kubebuilder:scaffold:imports "github.com/spf13/pflag" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -75,7 +74,6 @@ func init() { _ = controlplanev1.AddToScheme(scheme) _ = bootstrapv1.AddToScheme(scheme) _ = apiextensionsv1.AddToScheme(scheme) - // +kubebuilder:scaffold:scheme } var ( @@ -271,7 +269,6 @@ func main() { setupReconcilers(ctx, mgr) setupWebhooks(mgr) - // +kubebuilder:scaffold:builder setupLog.Info("starting manager", "version", version.Get().String()) if err := mgr.Start(ctx); err != nil { setupLog.Error(err, "problem running manager") diff --git a/exp/PROJECT b/exp/PROJECT deleted file mode 100644 index ba63b66d231c..000000000000 --- a/exp/PROJECT +++ /dev/null @@ -1,10 +0,0 @@ -domain: x-k8s.io -repo: sigs.k8s.io/cluster-api/exp -version: "2" -resources: -- group: cluster - kind: MachinePool - version: v1alpha4 -- group: cluster - kind: MachinePool - version: v1beta1 diff --git a/exp/addons/PROJECT b/exp/addons/PROJECT deleted file mode 100644 index 9e994f82548f..000000000000 --- a/exp/addons/PROJECT +++ /dev/null @@ -1,14 +0,0 @@ -domain: cluster.x-k8s.io -repo: sigs.k8s.io/cluster-api/exp/addons -version: "2" -resources: -- group: addons - kind: ClusterResourceSet - version: v1alpha3 -- group: addons - kind: ClusterResourceSet - version: v1alpha4 -- group: addons - kind: ClusterResourceSet - version: v1beta1 - diff --git a/exp/addons/internal/controllers/suite_test.go b/exp/addons/internal/controllers/suite_test.go index dbacc0f13337..0f9fcad54cb2 100644 --- a/exp/addons/internal/controllers/suite_test.go +++ b/exp/addons/internal/controllers/suite_test.go @@ -22,7 +22,6 @@ import ( "os" "testing" - // +kubebuilder:scaffold:imports corev1 "k8s.io/api/core/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/exp/internal/controllers/suite_test.go b/exp/internal/controllers/suite_test.go index 5cd27d812c97..93194d2f8361 100644 --- a/exp/internal/controllers/suite_test.go +++ b/exp/internal/controllers/suite_test.go @@ -25,7 +25,6 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/controller" - // +kubebuilder:scaffold:imports "sigs.k8s.io/cluster-api/api/v1beta1/index" "sigs.k8s.io/cluster-api/internal/test/envtest" ) diff --git a/internal/controllers/cluster/suite_test.go b/internal/controllers/cluster/suite_test.go index 3516c0a9be3e..e9370946fff2 100644 --- a/internal/controllers/cluster/suite_test.go +++ b/internal/controllers/cluster/suite_test.go @@ -23,7 +23,6 @@ import ( "testing" "time" - // +kubebuilder:scaffold:imports . "github.com/onsi/gomega" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/controllers/machine/suite_test.go b/internal/controllers/machine/suite_test.go index 41cfc1f3a657..4893c5d653b9 100644 --- a/internal/controllers/machine/suite_test.go +++ b/internal/controllers/machine/suite_test.go @@ -23,7 +23,6 @@ import ( "testing" "time" - // +kubebuilder:scaffold:imports . "github.com/onsi/gomega" "github.com/onsi/gomega/types" "github.com/pkg/errors" diff --git a/internal/controllers/machinedeployment/suite_test.go b/internal/controllers/machinedeployment/suite_test.go index 8ea4b87516a4..8a49c8cb0847 100644 --- a/internal/controllers/machinedeployment/suite_test.go +++ b/internal/controllers/machinedeployment/suite_test.go @@ -23,7 +23,6 @@ import ( "testing" "time" - // +kubebuilder:scaffold:imports . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/internal/controllers/machinehealthcheck/suite_test.go b/internal/controllers/machinehealthcheck/suite_test.go index 2d51562a8b59..1975241296c3 100644 --- a/internal/controllers/machinehealthcheck/suite_test.go +++ b/internal/controllers/machinehealthcheck/suite_test.go @@ -23,7 +23,6 @@ import ( "testing" "time" - // +kubebuilder:scaffold:imports . "github.com/onsi/gomega" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/controllers/machineset/suite_test.go b/internal/controllers/machineset/suite_test.go index cda532fe42dd..c7fdde445ddf 100644 --- a/internal/controllers/machineset/suite_test.go +++ b/internal/controllers/machineset/suite_test.go @@ -23,7 +23,6 @@ import ( "testing" "time" - // +kubebuilder:scaffold:imports . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/main.go b/main.go index 4fe271b757e3..1e3ce3d974d2 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,6 @@ import ( goruntime "runtime" "time" - // +kubebuilder:scaffold:imports "github.com/spf13/pflag" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -127,7 +126,6 @@ func init() { _ = runtimev1.AddToScheme(scheme) _ = ipamv1.AddToScheme(scheme) - // +kubebuilder:scaffold:scheme // Register the RuntimeHook types into the catalog. _ = runtimehooksv1.AddToCatalog(catalog) @@ -338,7 +336,6 @@ func main() { setupReconcilers(ctx, mgr) setupWebhooks(mgr) - // +kubebuilder:scaffold:builder setupLog.Info("starting manager", "version", version.Get().String()) if err := mgr.Start(ctx); err != nil { setupLog.Error(err, "problem running manager") diff --git a/test/infrastructure/docker/PROJECT b/test/infrastructure/docker/PROJECT deleted file mode 100644 index 67e5a16e5c74..000000000000 --- a/test/infrastructure/docker/PROJECT +++ /dev/null @@ -1,34 +0,0 @@ -version: "2" -domain: cluster.x-k8s.io -repo: sigs.k8s.io/cluster-api/test/infrastructure/docker -resources: -- group: infrastructure - version: v1alpha4 - kind: DockerCluster -- group: infrastructure - version: v1alpha4 - kind: DockerMachine -- group: infrastructure - version: v1alpha4 - kind: DockerMachineTemplate -- group: infrastructure - version: v1alpha4 - kind: DockerMachinePool -- group: infrastructure - version: v1alpha4 - kind: DockerClusterTemplate -- group: infrastructure - version: v1beta1 - kind: DockerCluster -- group: infrastructure - version: v1beta1 - kind: DockerMachine -- group: infrastructure - version: v1beta1 - kind: DockerMachineTemplate -- group: infrastructure - version: v1beta1 - kind: DockerMachinePool -- group: infrastructure - version: v1beta1 - kind: DockerClusterTemplate diff --git a/test/infrastructure/docker/exp/PROJECT b/test/infrastructure/docker/exp/PROJECT deleted file mode 100644 index 66ca5499d758..000000000000 --- a/test/infrastructure/docker/exp/PROJECT +++ /dev/null @@ -1,13 +0,0 @@ -version: "2" -domain: cluster.x-k8s.io -repo: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp -resources: -- group: infrastructure - kind: DockerMachinePool - version: v1alpha3 -- group: infrastructure - kind: DockerMachinePool - version: v1alpha4 -- group: infrastructure - kind: DockerMachinePool - version: v1beta1 diff --git a/test/infrastructure/docker/main.go b/test/infrastructure/docker/main.go index 8809dbd73e30..703fac9507cf 100644 --- a/test/infrastructure/docker/main.go +++ b/test/infrastructure/docker/main.go @@ -25,7 +25,6 @@ import ( goruntime "runtime" "time" - // +kubebuilder:scaffold:imports "github.com/spf13/pflag" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" @@ -96,7 +95,6 @@ func init() { _ = infraexpv1.AddToScheme(scheme) _ = clusterv1.AddToScheme(scheme) _ = expv1.AddToScheme(scheme) - // +kubebuilder:scaffold:scheme } // InitFlags initializes the flags. @@ -263,7 +261,6 @@ func main() { setupReconcilers(ctx, mgr) setupWebhooks(mgr) - // +kubebuilder:scaffold:builder setupLog.Info("starting manager", "version", version.Get().String()) if err := mgr.Start(ctx); err != nil { setupLog.Error(err, "problem running manager") diff --git a/test/infrastructure/inmemory/main.go b/test/infrastructure/inmemory/main.go index 7fe5af1122a1..63bd1fd4ea34 100644 --- a/test/infrastructure/inmemory/main.go +++ b/test/infrastructure/inmemory/main.go @@ -245,7 +245,6 @@ func main() { setupReconcilers(ctx, mgr) setupWebhooks(mgr) - // +kubebuilder:scaffold:builder setupLog.Info("starting manager", "version", version.Get().String()) if err := mgr.Start(ctx); err != nil { setupLog.Error(err, "problem running manager")