Skip to content

Commit 86fc928

Browse files
vinceprivincepri
committed
Add v1alpha2 types 🎉
Signed-off-by: Vince Prignano <[email protected]>
1 parent 337ec9c commit 86fc928

File tree

224 files changed

+8801
-1843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+8801
-1843
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ config/ci/rbac/role_binding.yaml
4242
config/ci/rbac/role.yaml
4343
config/ci/manager/manager.yaml
4444

45+
config/crds-v1alpha1
46+

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ The machine controller should be able to act on a subset of machines that form a
6565
### Resources
6666

6767
* [Cluster Management API KEP](https://github.com/kubernetes/enhancements/blob/master/keps/sig-cluster-lifecycle/0003-cluster-api.md)
68-
* [Cluster type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/cluster/v1alpha1/cluster_types.go#L40)
69-
* [Machine type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/cluster/v1alpha1/machine_types.go#L42)
68+
* [Cluster type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/deprecated/v1alpha1/cluster_types.go#L40)
69+
* [Machine type](https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/apis/deprecated/v1alpha1/machine_types.go#L42)
7070

7171
### Boostrapping
7272

‎Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ generate-clientset: ## Generate a typed clientset
102102
go run ./vendor/k8s.io/code-generator/cmd/client-gen/main.go \
103103
--clientset-name clientset \
104104
--input-base sigs.k8s.io/cluster-api/pkg/apis \
105-
--input cluster/v1alpha1 \
105+
--input deprecated/v1alpha1,cluster/v1alpha2 \
106106
--output-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated \
107107
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
108108
go run ./vendor/k8s.io/code-generator/cmd/lister-gen/main.go \
109-
--input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1 \
109+
--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
110110
--output-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
111111
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
112112
go run ./vendor/k8s.io/code-generator/cmd/informer-gen/main.go \
113-
--input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1 \
113+
--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
114114
--versioned-clientset-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset \
115115
--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
116116
--output-package sigs.k8s.io/cluster-api/pkg/client/informers_generated \
@@ -123,6 +123,7 @@ generate-manifests: ## Generate manifests e.g. CRD, RBAC etc.
123123
crd:trivialVersions=true \
124124
rbac:roleName=manager-role \
125125
output:crd:dir=./config/crds
126+
## Copy files in CI folders.
126127
cp -f ./config/rbac/role*.yaml ./config/ci/rbac/
127128
cp -f ./config/manager/manager*.yaml ./config/ci/manager/
128129

‎cmd/clusterctl/clusterdeployer/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ go_library(
1414
"//cmd/clusterctl/clusterdeployer/provider:go_default_library",
1515
"//cmd/clusterctl/phases:go_default_library",
1616
"//cmd/clusterctl/providercomponents:go_default_library",
17-
"//pkg/apis/cluster/v1alpha1:go_default_library",
17+
"//pkg/apis/cluster/v1alpha2:go_default_library",
1818
"//vendor/github.com/pkg/errors:go_default_library",
1919
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
2020
"//vendor/k8s.io/klog:go_default_library",
@@ -28,7 +28,7 @@ go_test(
2828
deps = [
2929
"//cmd/clusterctl/clusterdeployer/clusterclient:go_default_library",
3030
"//cmd/clusterctl/clusterdeployer/provider:go_default_library",
31-
"//pkg/apis/cluster/v1alpha1:go_default_library",
31+
"//pkg/apis/cluster/v1alpha2:go_default_library",
3232
"//vendor/github.com/pkg/errors:go_default_library",
3333
"//vendor/k8s.io/api/core/v1:go_default_library",
3434
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

‎cmd/clusterctl/clusterdeployer/clusterclient/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ go_library(
1010
visibility = ["//visibility:public"],
1111
deps = [
1212
"//cmd/clusterctl/clientcmd:go_default_library",
13-
"//pkg/apis/cluster/v1alpha1:go_default_library",
13+
"//pkg/apis/cluster/v1alpha2:go_default_library",
1414
"//pkg/client/clientset_generated/clientset:go_default_library",
1515
"//pkg/util:go_default_library",
1616
"//vendor/github.com/pkg/errors:go_default_library",

‎cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

+53-133
Large diffs are not rendered by default.

‎cmd/clusterctl/clusterdeployer/clusterdeployer.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
2727
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider"
2828
"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
29-
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
29+
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
3030
)
3131

3232
type ClusterDeployer struct {
@@ -237,11 +237,6 @@ func deleteClusterAPIObjectsInAllNamespaces(client clusterclient.Client) error {
237237
err = errors.Wrap(err, "error deleting Machines")
238238
errorList = append(errorList, err.Error())
239239
}
240-
klog.Infof("Deleting MachineClasses in all namespaces")
241-
if err := client.DeleteMachineClasses(""); err != nil {
242-
err = errors.Wrap(err, "error deleting MachineClasses")
243-
errorList = append(errorList, err.Error())
244-
}
245240
klog.Infof("Deleting Clusters in all namespaces")
246241
if err := client.DeleteClusters(""); err != nil {
247242
err = errors.Wrap(err, "error deleting Clusters")

‎cmd/clusterctl/clusterdeployer/clusterdeployer_test.go

+8-44
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/client-go/kubernetes"
2929
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
3030
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider"
31-
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
31+
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
3232
)
3333

3434
type testClusterProvisioner struct {
@@ -91,7 +91,7 @@ type stringCheckFunc func(string) error
9191
type testClusterClient struct {
9292
ApplyErr error
9393
DeleteErr error
94-
WaitForClusterV1alpha1ReadyErr error
94+
WaitForClusterV1alpha2ReadyErr error
9595
GetClustersErr error
9696
GetClusterErr error
9797
GetMachineClassesErr error
@@ -117,7 +117,6 @@ type testClusterClient struct {
117117
ApplyFunc stringCheckFunc
118118

119119
clusters map[string][]*clusterv1.Cluster
120-
machineClasses map[string][]*clusterv1.MachineClass
121120
machineDeployments map[string][]*clusterv1.MachineDeployment
122121
machineSets map[string][]*clusterv1.MachineSet
123122
machines map[string][]*clusterv1.Machine
@@ -143,8 +142,8 @@ func (c *testClusterClient) GetContextNamespace() string {
143142
return c.contextNamespace
144143
}
145144

146-
func (c *testClusterClient) WaitForClusterV1alpha1Ready() error {
147-
return c.WaitForClusterV1alpha1ReadyErr
145+
func (c *testClusterClient) WaitForClusterV1alpha2Ready() error {
146+
return c.WaitForClusterV1alpha2ReadyErr
148147
}
149148

150149
func (c *testClusterClient) GetCluster(clusterName, namespace string) (*clusterv1.Cluster, error) {
@@ -273,18 +272,6 @@ func (c *testClusterClient) DeleteClusters(ns string) error {
273272
return nil
274273
}
275274

276-
func (c *testClusterClient) DeleteMachineClasses(ns string) error {
277-
if c.DeleteMachineClassesErr != nil {
278-
return c.DeleteMachineClassesErr
279-
}
280-
if ns == "" {
281-
c.machineClasses = make(map[string][]*clusterv1.MachineClass)
282-
} else {
283-
delete(c.machineClasses, ns)
284-
}
285-
return nil
286-
}
287-
288275
func (c *testClusterClient) DeleteMachineDeployments(ns string) error {
289276
if c.DeleteMachineDeploymentsErr != nil {
290277
return c.DeleteMachineDeploymentsErr
@@ -490,21 +477,6 @@ func (c *testClusterClient) WaitForResourceStatuses() error {
490477
return nil
491478
}
492479

493-
// TODO: implement GetMachineClasses for testClusterClient and add tests
494-
func (c *testClusterClient) GetMachineClasses(namespace string) ([]*clusterv1.MachineClass, error) {
495-
return c.machineClasses[namespace], c.GetMachineClassesErr
496-
}
497-
498-
// TODO: implement CreateMachineClass for testClusterClient and add tests
499-
func (c *testClusterClient) CreateMachineClass(*clusterv1.MachineClass) error {
500-
return errors.Errorf("CreateMachineClass Not yet implemented.")
501-
}
502-
503-
// TODO: implement DeleteMachineClass for testClusterClient and add tests
504-
func (c *testClusterClient) DeleteMachineClass(namespace, name string) error {
505-
return errors.Errorf("DeleteMachineClass Not yet implemented.")
506-
}
507-
508480
func contains(s []string, e string) bool {
509481
exists := false
510482
for _, existingNs := range s {
@@ -702,7 +674,7 @@ func TestClusterCreate(t *testing.T) {
702674
{
703675
name: "fail waiting for api ready on bootstrap cluster",
704676
targetClient: &testClusterClient{ApplyFunc: func(yaml string) error { return nil }},
705-
bootstrapClient: &testClusterClient{WaitForClusterV1alpha1ReadyErr: errors.New("Test failure")},
677+
bootstrapClient: &testClusterClient{WaitForClusterV1alpha2ReadyErr: errors.New("Test failure")},
706678
namespaceToExpectedInternalMachines: make(map[string]int),
707679
namespaceToInputCluster: map[string][]*clusterv1.Cluster{metav1.NamespaceDefault: getClustersForNamespace(metav1.NamespaceDefault, 1)},
708680
cleanupExternal: true,
@@ -771,7 +743,7 @@ func TestClusterCreate(t *testing.T) {
771743
},
772744
{
773745
name: "fail wait for api ready on target cluster",
774-
targetClient: &testClusterClient{WaitForClusterV1alpha1ReadyErr: errors.New("Test failure")},
746+
targetClient: &testClusterClient{WaitForClusterV1alpha2ReadyErr: errors.New("Test failure")},
775747
bootstrapClient: &testClusterClient{},
776748
namespaceToExpectedInternalMachines: make(map[string]int),
777749
namespaceToInputCluster: map[string][]*clusterv1.Cluster{metav1.NamespaceDefault: getClustersForNamespace(metav1.NamespaceDefault, 1)},
@@ -1376,9 +1348,6 @@ func TestClusterDelete(t *testing.T) {
13761348
for _, machineSets := range testCase.bootstrapClient.machineSets {
13771349
bootstrapMachineSets = bootstrapMachineSets + len(machineSets)
13781350
}
1379-
for _, machineClasses := range testCase.bootstrapClient.machineClasses {
1380-
bootstrapMachineClasses = bootstrapMachineClasses + len(machineClasses)
1381-
}
13821351
for _, clusters := range testCase.targetClient.clusters {
13831352
targetClusters = targetClusters + len(clusters)
13841353
}
@@ -1391,9 +1360,6 @@ func TestClusterDelete(t *testing.T) {
13911360
for _, machineSets := range testCase.targetClient.machineSets {
13921361
targetMachineSets = targetMachineSets + len(machineSets)
13931362
}
1394-
for _, machineClasses := range testCase.targetClient.machineClasses {
1395-
targetMachineClasses = targetMachineClasses + len(machineClasses)
1396-
}
13971363

13981364
if bootstrapClusters != 0 {
13991365
t.Fatalf("Unexpected Cluster count in bootstrap cluster. Got: %d, Want: 0", bootstrapClusters)
@@ -1434,10 +1400,8 @@ func generateTestControlPlaneMachines(cluster *clusterv1.Cluster, ns string, nam
14341400
machines := make([]*clusterv1.Machine, 0, len(names))
14351401
for _, name := range names {
14361402
machine := generateTestNodeMachine(cluster, ns, name)
1437-
machine.Spec = clusterv1.MachineSpec{
1438-
Versions: clusterv1.MachineVersionInfo{
1439-
ControlPlane: "1.10.1",
1440-
},
1403+
machine.ObjectMeta.Labels = map[string]string{
1404+
clusterv1.MachineControlPlaneLabelName: "true",
14411405
}
14421406
machines = append(machines, machine)
14431407
}

‎cmd/clusterctl/clusterdeployer/provider/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go_library(
66
importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/provider",
77
visibility = ["//visibility:public"],
88
deps = [
9-
"//pkg/apis/cluster/v1alpha1:go_default_library",
9+
"//pkg/apis/cluster/v1alpha2:go_default_library",
1010
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
1111
],
1212
)

‎cmd/clusterctl/clusterdeployer/provider/provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package provider
1818

1919
import (
2020
"k8s.io/client-go/kubernetes"
21-
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
21+
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
2222
)
2323

2424
// Deployer is a deprecated interface for Provider specific logic. Please do not extend or add. This interface should be removed

‎cmd/clusterctl/phases/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ go_library(
1818
"//cmd/clusterctl/clusterdeployer/bootstrap:go_default_library",
1919
"//cmd/clusterctl/clusterdeployer/clusterclient:go_default_library",
2020
"//cmd/clusterctl/clusterdeployer/provider:go_default_library",
21-
"//pkg/apis/cluster/v1alpha1:go_default_library",
21+
"//pkg/apis/cluster/v1alpha2:go_default_library",
2222
"//pkg/util:go_default_library",
2323
"//vendor/github.com/pkg/errors:go_default_library",
2424
"//vendor/k8s.io/api/apps/v1:go_default_library",
@@ -32,7 +32,7 @@ go_test(
3232
srcs = ["pivot_test.go"],
3333
embed = [":go_default_library"],
3434
deps = [
35-
"//pkg/apis/cluster/v1alpha1:go_default_library",
35+
"//pkg/apis/cluster/v1alpha2:go_default_library",
3636
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
3737
],
3838
)

‎cmd/clusterctl/phases/applycluster.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/pkg/errors"
2121
"k8s.io/klog"
2222
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
23-
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
23+
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
2424
)
2525

2626
func ApplyCluster(client clusterclient.Client, cluster *clusterv1.Cluster) error {

‎cmd/clusterctl/phases/applyclusterapicomponents.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ func ApplyClusterAPIComponents(client clusterclient.Client, providerComponents s
2828
return errors.Wrap(err, "unable to apply cluster api controllers")
2929
}
3030

31-
return client.WaitForClusterV1alpha1Ready()
31+
return client.WaitForClusterV1alpha2Ready()
3232
}

‎cmd/clusterctl/phases/applymachines.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/pkg/errors"
2121
"k8s.io/klog"
2222
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
23-
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
23+
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
2424
)
2525

2626
func ApplyMachines(client clusterclient.Client, namespace string, machines []*clusterv1.Machine) error {

0 commit comments

Comments
 (0)