Merge pull request #1959 from detiber/utilInjection

✨ Refactor template cloning for future use with kubeadmcontrolplane
kubernetes-sigs · Dec 24, 2019 · 053db10 · 053db10
2 parents e4961fc + 1815a45
commit 053db10
Show file tree

Hide file tree

Showing 6 changed files with 390 additions and 35 deletions.
diff --git a/controllers/external/util.go b/controllers/external/util.go
@@ -23,8 +23,11 @@ import (
 
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 )
 
 const (
@@ -46,8 +49,10 @@ func Get(ctx context.Context, c client.Client, ref *corev1.ObjectReference, name
 	return obj, nil
 }
 
+type TemplateCloner struct{}
+
 // CloneTemplate uses the client and the reference to create a new object from the template.
-func CloneTemplate(ctx context.Context, c client.Client, ref *corev1.ObjectReference, namespace string) (*unstructured.Unstructured, error) {
+func (tc *TemplateCloner) CloneTemplate(ctx context.Context, c client.Client, ref *corev1.ObjectReference, namespace, clusterName string, owner *metav1.OwnerReference) (*corev1.ObjectReference, error) {
 	from, err := Get(ctx, c, ref, namespace)
 	if err != nil {
 		return nil, err
@@ -62,14 +67,18 @@ func CloneTemplate(ctx context.Context, c client.Client, ref *corev1.ObjectRefer
 	// Create the unstructured object from the template.
 	to := &unstructured.Unstructured{Object: template}
 	to.SetResourceVersion("")
-	to.SetOwnerReferences(nil)
+	to.SetLabels(map[string]string{clusterv1.ClusterLabelName: clusterName})
 	to.SetFinalizers(nil)
 	to.SetUID("")
 	to.SetSelfLink("")
 	to.SetName("")
 	to.SetGenerateName(fmt.Sprintf("%s-", from.GetName()))
 	to.SetNamespace(namespace)
 
+	if owner != nil {
+		to.SetOwnerReferences([]metav1.OwnerReference{*owner})
+	}
+
 	// Set the object APIVersion.
 	if to.GetAPIVersion() == "" {
 		to.SetAPIVersion(ref.APIVersion)
@@ -84,7 +93,16 @@ func CloneTemplate(ctx context.Context, c client.Client, ref *corev1.ObjectRefer
 	if err := c.Create(context.Background(), to); err != nil {
 		return nil, err
 	}
-	return to, nil
+
+	toRef := &corev1.ObjectReference{
+		APIVersion: to.GetAPIVersion(),
+		Kind:       to.GetKind(),
+		Name:       to.GetName(),
+		Namespace:  to.GetNamespace(),
+		UID:        to.GetUID(),
+	}
+
+	return toRef, nil
 }
 
 // FailuresFrom returns the FailureReason and FailureMessage fields from the external object status.

diff --git a/controllers/external/util_test.go b/controllers/external/util_test.go
@@ -0,0 +1,319 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package external
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/onsi/gomega"
+	"github.com/pkg/errors"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
+)
+
+func TestGetResourceFound(t *testing.T) {
+	g := gomega.NewGomegaWithT(t)
+
+	namespace := "test"
+	testResourceName := "greenTemplate"
+	testResourceKind := "GreenTemplate"
+	testResourceAPIVersion := "green.io/v1"
+
+	testResource := &unstructured.Unstructured{}
+	testResource.SetKind(testResourceKind)
+	testResource.SetAPIVersion(testResourceAPIVersion)
+	testResource.SetName(testResourceName)
+	testResource.SetNamespace(namespace)
+
+	testResourceReference := &corev1.ObjectReference{
+		Kind:       testResourceKind,
+		APIVersion: testResourceAPIVersion,
+		Name:       testResourceName,
+		Namespace:  namespace,
+	}
+
+	fakeClient := fake.NewFakeClientWithScheme(runtime.NewScheme(), testResource.DeepCopy())
+	got, err := Get(context.Background(), fakeClient, testResourceReference, namespace)
+	g.Expect(err).NotTo(gomega.HaveOccurred())
+	g.Expect(got).To(gomega.Equal(testResource))
+}
+
+func TestGetResourceNotFound(t *testing.T) {
+	g := gomega.NewGomegaWithT(t)
+
+	namespace := "test"
+
+	testResourceReference := &corev1.ObjectReference{
+		Kind:       "BlueTemplate",
+		APIVersion: "blue.io/v1",
+		Name:       "blueTemplate",
+		Namespace:  namespace,
+	}
+
+	fakeClient := fake.NewFakeClientWithScheme(runtime.NewScheme())
+	_, err := Get(context.Background(), fakeClient, testResourceReference, namespace)
+	g.Expect(err).To(gomega.HaveOccurred())
+	g.Expect(apierrors.IsNotFound(errors.Cause(err))).To(gomega.BeTrue())
+}
+
+func TestCloneTemplateResourceNotFound(t *testing.T) {
+	g := gomega.NewGomegaWithT(t)
+
+	namespace := "test"
+	testClusterName := "bar"
+
+	testResourceReference := &corev1.ObjectReference{
+		Kind:       "OrangeTemplate",
+		APIVersion: "orange.io/v1",
+		Name:       "orangeTemplate",
+		Namespace:  namespace,
+	}
+
+	fakeClient := fake.NewFakeClientWithScheme(runtime.NewScheme())
+	templateCloner := TemplateCloner{}
+	_, err := templateCloner.CloneTemplate(
+		context.Background(),
+		fakeClient,
+		testResourceReference,
+		namespace,
+		testClusterName,
+		nil,
+	)
+	g.Expect(err).To(gomega.HaveOccurred())
+	g.Expect(apierrors.IsNotFound(errors.Cause(err))).To(gomega.BeTrue())
+}
+
+func TestCloneTemplateResourceFound(t *testing.T) {
+	g := gomega.NewGomegaWithT(t)
+
+	namespace := "test"
+	testClusterName := "test-cluster"
+
+	templateName := "purpleTemplate"
+	templateKind := "PurpleTemplate"
+	templateAPIVersion := "purple.io/v1"
+
+	template := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"kind":       templateKind,
+			"apiVersion": templateAPIVersion,
+			"metadata": map[string]interface{}{
+				"name":      templateName,
+				"namespace": namespace,
+			},
+			"spec": map[string]interface{}{
+				"template": map[string]interface{}{
+					"spec": map[string]interface{}{
+						"hello": "world",
+					},
+				},
+			},
+		},
+	}
+
+	templateRef := &corev1.ObjectReference{
+		Kind:       templateKind,
+		APIVersion: templateAPIVersion,
+		Name:       templateName,
+		Namespace:  namespace,
+	}
+
+	owner := metav1.OwnerReference{
+		Kind:       "Cluster",
+		APIVersion: clusterv1.GroupVersion.String(),
+		Name:       "test-cluster",
+	}
+
+	expectedKind := "Purple"
+	expectedAPIVersion := templateAPIVersion
+	expectedRef := &corev1.ObjectReference{
+		Kind:       expectedKind,
+		APIVersion: expectedAPIVersion,
+		Namespace:  namespace,
+	}
+
+	expected := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"kind":       expectedKind,
+			"apiVersion": expectedAPIVersion,
+			"metadata": map[string]interface{}{
+				"namespace":    namespace,
+				"generateName": fmt.Sprintf("%s-", templateName),
+			},
+			"spec": map[string]interface{}{
+				"hello": "world",
+			},
+		},
+	}
+	expected.SetOwnerReferences([]metav1.OwnerReference{owner})
+	expected.SetLabels(map[string]string{clusterv1.ClusterLabelName: testClusterName})
+	expected.SetResourceVersion("1")
+
+	fakeClient := fake.NewFakeClientWithScheme(runtime.NewScheme(), template.DeepCopy())
+
+	templateCloner := TemplateCloner{}
+	ref, err := templateCloner.CloneTemplate(
+		context.Background(),
+		fakeClient,
+		templateRef,
+		namespace,
+		testClusterName,
+		owner.DeepCopy(),
+	)
+	g.Expect(err).NotTo(gomega.HaveOccurred())
+	g.Expect(ref).To(gomega.Equal(expectedRef))
+
+	clone := &unstructured.Unstructured{}
+	clone.SetKind(expectedKind)
+	clone.SetAPIVersion(expectedAPIVersion)
+	key := client.ObjectKey{Name: ref.Name, Namespace: ref.Namespace}
+	g.Expect(fakeClient.Get(context.Background(), key, clone)).To(gomega.Succeed())
+	g.Expect(clone).To(gomega.Equal(expected))
+}
+
+func TestCloneTemplateResourceFoundNoOwner(t *testing.T) {
+	g := gomega.NewGomegaWithT(t)
+
+	namespace := "test"
+	testClusterName := "test-cluster"
+
+	templateName := "yellowTemplate"
+	templateKind := "YellowTemplate"
+	templateAPIVersion := "yellow.io/v1"
+
+	template := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"kind":       templateKind,
+			"apiVersion": templateAPIVersion,
+			"metadata": map[string]interface{}{
+				"name":      templateName,
+				"namespace": namespace,
+			},
+			"spec": map[string]interface{}{
+				"template": map[string]interface{}{
+					"spec": map[string]interface{}{
+						"hello": "world",
+					},
+				},
+			},
+		},
+	}
+
+	templateRef := &corev1.ObjectReference{
+		Kind:       templateKind,
+		APIVersion: templateAPIVersion,
+		Name:       templateName,
+		Namespace:  namespace,
+	}
+
+	expectedKind := "Yellow"
+	expectedAPIVersion := templateAPIVersion
+	expectedRef := &corev1.ObjectReference{
+		Kind:       expectedKind,
+		APIVersion: expectedAPIVersion,
+		Namespace:  namespace,
+	}
+
+	expected := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"kind":       expectedKind,
+			"apiVersion": expectedAPIVersion,
+			"metadata": map[string]interface{}{
+				"namespace":    namespace,
+				"generateName": fmt.Sprintf("%s-", templateName),
+			},
+			"spec": map[string]interface{}{
+				"hello": "world",
+			},
+		},
+	}
+	expected.SetLabels(map[string]string{clusterv1.ClusterLabelName: testClusterName})
+	expected.SetResourceVersion("1")
+
+	fakeClient := fake.NewFakeClientWithScheme(runtime.NewScheme(), template.DeepCopy())
+
+	templateCloner := TemplateCloner{}
+	ref, err := templateCloner.CloneTemplate(
+		context.Background(),
+		fakeClient,
+		templateRef,
+		namespace,
+		testClusterName,
+		nil,
+	)
+	g.Expect(err).NotTo(gomega.HaveOccurred())
+	g.Expect(ref).To(gomega.Equal(expectedRef))
+
+	clone := &unstructured.Unstructured{}
+	clone.SetKind(expectedKind)
+	clone.SetAPIVersion(expectedAPIVersion)
+	key := client.ObjectKey{Name: ref.Name, Namespace: ref.Namespace}
+	g.Expect(fakeClient.Get(context.Background(), key, clone)).To(gomega.Succeed())
+	g.Expect(clone).To(gomega.Equal(expected))
+}
+
+func TestCloneTemplateMissingSpecTemplate(t *testing.T) {
+	g := gomega.NewGomegaWithT(t)
+
+	namespace := "test"
+	testClusterName := "test-cluster"
+
+	templateName := "aquaTemplate"
+	templateKind := "AquaTemplate"
+	templateAPIVersion := "aqua.io/v1"
+
+	template := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"kind":       templateKind,
+			"apiVersion": templateAPIVersion,
+			"metadata": map[string]interface{}{
+				"name":      templateName,
+				"namespace": namespace,
+			},
+			"spec": map[string]interface{}{},
+		},
+	}
+
+	templateRef := &corev1.ObjectReference{
+		Kind:       templateKind,
+		APIVersion: templateAPIVersion,
+		Name:       templateName,
+		Namespace:  namespace,
+	}
+
+	fakeClient := fake.NewFakeClientWithScheme(runtime.NewScheme(), template.DeepCopy())
+
+	templateCloner := TemplateCloner{}
+	_, err := templateCloner.CloneTemplate(
+		context.Background(),
+		fakeClient,
+		templateRef,
+		namespace,
+		testClusterName,
+		nil,
+	)
+	g.Expect(err).To(gomega.HaveOccurred())
+}