Skip to content

Commit 69a9991

Browse files
committed
NodeRef controller
Signed-off-by: Vince Prignano <[email protected]>
1 parent 280e527 commit 69a9991

File tree

7 files changed

+420
-1
lines changed

7 files changed

+420
-1
lines changed

pkg/controller/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ go_library(
66
"add_machinedeployment.go",
77
"add_machineset.go",
88
"add_node.go",
9+
"add_noderef.go",
910
"controller.go",
1011
],
1112
importpath = "sigs.k8s.io/cluster-api/pkg/controller",
@@ -14,6 +15,7 @@ go_library(
1415
"//pkg/controller/machinedeployment:go_default_library",
1516
"//pkg/controller/machineset:go_default_library",
1617
"//pkg/controller/node:go_default_library",
18+
"//pkg/controller/noderef:go_default_library",
1719
"//vendor/sigs.k8s.io/controller-runtime/pkg/manager:go_default_library",
1820
],
1921
)

pkg/controller/add_noderef.go

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
Copyright 2019 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package controller
18+
19+
import (
20+
"sigs.k8s.io/cluster-api/pkg/controller/noderef"
21+
)
22+
23+
func init() {
24+
// AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
25+
AddToManagerFuncs = append(AddToManagerFuncs, noderef.Add)
26+
}

pkg/controller/noderef/BUILD.bazel

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
2+
3+
go_library(
4+
name = "go_default_library",
5+
srcs = ["noderef_controller.go"],
6+
importpath = "sigs.k8s.io/cluster-api/pkg/controller/noderef",
7+
visibility = ["//visibility:public"],
8+
deps = [
9+
"//pkg/apis/cluster/v1alpha1:go_default_library",
10+
"//pkg/controller/remote:go_default_library",
11+
"//vendor/github.com/pkg/errors:go_default_library",
12+
"//vendor/k8s.io/api/core/v1:go_default_library",
13+
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
14+
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
15+
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
16+
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
17+
"//vendor/k8s.io/klog:go_default_library",
18+
"//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library",
19+
"//vendor/sigs.k8s.io/controller-runtime/pkg/controller:go_default_library",
20+
"//vendor/sigs.k8s.io/controller-runtime/pkg/handler:go_default_library",
21+
"//vendor/sigs.k8s.io/controller-runtime/pkg/manager:go_default_library",
22+
"//vendor/sigs.k8s.io/controller-runtime/pkg/reconcile:go_default_library",
23+
"//vendor/sigs.k8s.io/controller-runtime/pkg/source:go_default_library",
24+
],
25+
)
26+
27+
go_test(
28+
name = "go_default_test",
29+
srcs = [
30+
"noderef_controller_suite_test.go",
31+
"noderef_controller_test.go",
32+
],
33+
embed = [":go_default_library"],
34+
deps = [
35+
"//pkg/apis:go_default_library",
36+
"//pkg/apis/cluster/v1alpha1:go_default_library",
37+
"//vendor/github.com/onsi/gomega:go_default_library",
38+
"//vendor/golang.org/x/net/context:go_default_library",
39+
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
40+
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
41+
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
42+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
43+
"//vendor/k8s.io/client-go/rest:go_default_library",
44+
"//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library",
45+
"//vendor/sigs.k8s.io/controller-runtime/pkg/envtest:go_default_library",
46+
"//vendor/sigs.k8s.io/controller-runtime/pkg/manager:go_default_library",
47+
"//vendor/sigs.k8s.io/controller-runtime/pkg/reconcile:go_default_library",
48+
],
49+
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
/*
2+
Copyright 2019 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package noderef
18+
19+
import (
20+
"context"
21+
"time"
22+
23+
"github.com/pkg/errors"
24+
apicorev1 "k8s.io/api/core/v1"
25+
apierrors "k8s.io/apimachinery/pkg/api/errors"
26+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27+
"k8s.io/apimachinery/pkg/runtime"
28+
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
29+
"k8s.io/klog"
30+
clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
31+
"sigs.k8s.io/cluster-api/pkg/controller/remote"
32+
"sigs.k8s.io/controller-runtime/pkg/client"
33+
"sigs.k8s.io/controller-runtime/pkg/controller"
34+
"sigs.k8s.io/controller-runtime/pkg/handler"
35+
"sigs.k8s.io/controller-runtime/pkg/manager"
36+
"sigs.k8s.io/controller-runtime/pkg/reconcile"
37+
"sigs.k8s.io/controller-runtime/pkg/source"
38+
)
39+
40+
var (
41+
ErrNodeNotFound = errors.New("cannot find node with maching ProviderID")
42+
)
43+
44+
// Add creates a new NodeRef Controller and adds it to the Manager with default RBAC. The Manager will set fields on the Controller
45+
// and Start it when the Manager is Started.
46+
func Add(mgr manager.Manager) error {
47+
return add(mgr, newReconciler(mgr))
48+
}
49+
50+
// newReconciler returns a new reconcile.Reconciler
51+
func newReconciler(mgr manager.Manager) reconcile.Reconciler {
52+
return &ReconcileNodeRef{Client: mgr.GetClient(), scheme: mgr.GetScheme()}
53+
}
54+
55+
// add adds a new Controller to mgr with r as the reconcile.Reconciler
56+
func add(mgr manager.Manager, r reconcile.Reconciler) error {
57+
// Create a new controller
58+
c, err := controller.New("noderef-controller", mgr, controller.Options{Reconciler: r})
59+
if err != nil {
60+
return err
61+
}
62+
63+
// Watch for changes to Machines.
64+
err = c.Watch(&source.Kind{Type: &clusterv1alpha1.Machine{}}, &handler.EnqueueRequestForObject{})
65+
if err != nil {
66+
return err
67+
}
68+
69+
return nil
70+
}
71+
72+
var _ reconcile.Reconciler = &ReconcileNodeRef{}
73+
74+
// ReconcileNodeRef reconciles a Machine object.
75+
type ReconcileNodeRef struct {
76+
client.Client
77+
scheme *runtime.Scheme
78+
}
79+
80+
// Reconcile watches Machines.
81+
func (r *ReconcileNodeRef) Reconcile(request reconcile.Request) (reconcile.Result, error) {
82+
// Fetch the NodeRef instance
83+
machine := &clusterv1alpha1.Machine{}
84+
err := r.Get(context.TODO(), request.NamespacedName, machine)
85+
if err != nil {
86+
if apierrors.IsNotFound(err) {
87+
return reconcile.Result{}, nil
88+
}
89+
return reconcile.Result{}, err
90+
}
91+
92+
// Check that the Machine hasn't been deleted or in the process.
93+
if !machine.DeletionTimestamp.IsZero() {
94+
return reconcile.Result{}, nil
95+
}
96+
97+
// Check that the Machine has a cluster label.
98+
if machine.Labels[clusterv1alpha1.MachineClusterLabelName] == "" {
99+
klog.Warningf("Machine %q in namespace %q doesn't specify %q label, cannot set nodeRef", machine.Name, machine.Namespace, clusterv1alpha1.MachineClusterLabelName)
100+
return reconcile.Result{}, nil
101+
}
102+
103+
// Check that the Machine has a valid ProviderID.
104+
if machine.Spec.ProviderID == nil || *machine.Spec.ProviderID == "" {
105+
klog.Warningf("Machine %q in namespace %q doesn't have a valid ProviderID, cannot set nodeRef", machine.Name, machine.Namespace)
106+
return reconcile.Result{}, nil
107+
}
108+
109+
cluster, err := r.getCluster(context.TODO(), machine)
110+
if err != nil {
111+
return reconcile.Result{}, err
112+
}
113+
114+
clusterClient, err := remote.NewClusterClient(r.Client, cluster)
115+
if err != nil {
116+
return reconcile.Result{}, err
117+
}
118+
119+
corev1Client, err := clusterClient.CoreV1()
120+
if err != nil {
121+
return reconcile.Result{}, err
122+
}
123+
124+
// Get the Node reference.
125+
nodeRef, err := r.getNodeReference(corev1Client, machine)
126+
if err != nil {
127+
if err == ErrNodeNotFound {
128+
return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
129+
}
130+
return reconcile.Result{}, err
131+
}
132+
133+
// Update Machine.
134+
machine.Status.NodeRef = nodeRef
135+
if err := r.Client.Update(context.TODO(), machine); err != nil {
136+
return reconcile.Result{}, err
137+
}
138+
139+
return reconcile.Result{}, nil
140+
}
141+
142+
func (r *ReconcileNodeRef) getCluster(ctx context.Context, machine *clusterv1alpha1.Machine) (*clusterv1alpha1.Cluster, error) {
143+
cluster := &clusterv1alpha1.Cluster{}
144+
key := client.ObjectKey{
145+
Namespace: machine.Namespace,
146+
Name: machine.Labels[clusterv1alpha1.MachineClusterLabelName],
147+
}
148+
149+
if err := r.Client.Get(ctx, key, cluster); err != nil {
150+
return nil, err
151+
}
152+
153+
return cluster, nil
154+
}
155+
156+
func (r *ReconcileNodeRef) getNodeReference(client corev1.CoreV1Interface, machine *clusterv1alpha1.Machine) (*apicorev1.ObjectReference, error) {
157+
listOpt := metav1.ListOptions{}
158+
159+
for {
160+
nodeList, err := client.Nodes().List(listOpt)
161+
if err != nil {
162+
return nil, err
163+
}
164+
165+
for _, node := range nodeList.Items {
166+
if node.Spec.ProviderID == *machine.Spec.ProviderID {
167+
return &apicorev1.ObjectReference{
168+
Kind: node.Kind,
169+
APIVersion: node.APIVersion,
170+
Name: node.Name,
171+
UID: node.UID,
172+
}, nil
173+
}
174+
}
175+
176+
listOpt.Continue = nodeList.Continue
177+
if listOpt.Continue == "" {
178+
break
179+
}
180+
}
181+
182+
return nil, ErrNodeNotFound
183+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
Copyright 2019 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package noderef
18+
19+
import (
20+
stdlog "log"
21+
"os"
22+
"path/filepath"
23+
"sync"
24+
"testing"
25+
26+
"github.com/onsi/gomega"
27+
"k8s.io/client-go/kubernetes/scheme"
28+
"k8s.io/client-go/rest"
29+
"sigs.k8s.io/cluster-api/pkg/apis"
30+
"sigs.k8s.io/controller-runtime/pkg/envtest"
31+
"sigs.k8s.io/controller-runtime/pkg/manager"
32+
"sigs.k8s.io/controller-runtime/pkg/reconcile"
33+
)
34+
35+
var cfg *rest.Config
36+
37+
func TestMain(m *testing.M) {
38+
t := &envtest.Environment{
39+
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crds")},
40+
}
41+
apis.AddToScheme(scheme.Scheme)
42+
43+
var err error
44+
if cfg, err = t.Start(); err != nil {
45+
stdlog.Fatal(err)
46+
}
47+
48+
code := m.Run()
49+
t.Stop()
50+
os.Exit(code)
51+
}
52+
53+
// SetupTestReconcile returns a reconcile.Reconcile implementation that delegates to inner and
54+
// writes the request to requests after Reconcile is finished.
55+
func SetupTestReconcile(inner reconcile.Reconciler) (reconcile.Reconciler, chan reconcile.Request) {
56+
requests := make(chan reconcile.Request)
57+
fn := reconcile.Func(func(req reconcile.Request) (reconcile.Result, error) {
58+
result, err := inner.Reconcile(req)
59+
requests <- req
60+
return result, err
61+
})
62+
return fn, requests
63+
}
64+
65+
// StartTestManager adds recFn
66+
func StartTestManager(mgr manager.Manager, g *gomega.GomegaWithT) (chan struct{}, *sync.WaitGroup) {
67+
stop := make(chan struct{})
68+
wg := &sync.WaitGroup{}
69+
wg.Add(1)
70+
go func() {
71+
defer wg.Done()
72+
g.Expect(mgr.Start(stop)).NotTo(gomega.HaveOccurred())
73+
}()
74+
return stop, wg
75+
}

0 commit comments

Comments
 (0)