Add namespaces to the cluster CRD.

Author: perotinus

examples/cluster-two.yaml

@@ -2,6 +2,7 @@ kind: Cluster
 apiVersion: clusterregistry.k8s.io/v1alpha1
 metadata:
   name: also-my-cluster
+  namespace: default
   labels:
     foo: bar
 spec:

examples/cluster.yaml

@@ -1,6 +1,7 @@
 kind: Cluster
 apiVersion: clusterregistry.k8s.io/v1alpha1
 metadata:
+  namespace: default
   name: my-cluster
   labels:
     foo: bar

examples/slackcontroller/slackcontroller.go

@@ -209,27 +209,28 @@ func (c *Controller) processNextWorkItem() bool {
 
 // syncHandler sends Slack notifications when the cluster is updated.
 func (c *Controller) syncHandler(key string) error {
+	glog.Infof(key)
 	// Convert the namespace/name string into a distinct namespace and name
-	_, name, err := cache.SplitMetaNamespaceKey(key)
+	namespace, name, err := cache.SplitMetaNamespaceKey(key)
 	if err != nil {
 		runtime.HandleError(fmt.Errorf("invalid resource key: %s", key))
 		return nil
 	}
 
-	bodyFormatString := "Cluster %s was added."
+	bodyFormatString := "Cluster %s was added in namespace %s."
 	// Get the Cluster resource with this name
-	cluster, err := c.clusterLister.Get(name)
+	cluster, err := c.clusterLister.Clusters(namespace).Get(name)
 	if err != nil {
 		// The Cluster resource may have been deleted, in which case we
 		// post a removal message.
 		if errors.IsNotFound(err) {
-			bodyFormatString = "Cluster %s was removed."
+			bodyFormatString = "Cluster %s was removed from namespace %s."
 		} else {
 			return err
 		}
 	}
 
-	body := strings.NewReader(fmt.Sprintf("{ 'text':'%s'}", fmt.Sprintf(bodyFormatString, name)))
+	body := strings.NewReader(fmt.Sprintf("{ 'text':'%s'}", fmt.Sprintf(bodyFormatString, name, namespace)))
 	client := &http.Client{}
 	resp, err := client.Post(c.slackURL, "application/json", body)
 	if err != nil {

pkg/apis/clusterregistry/v1alpha1/types.go

@@ -21,7 +21,6 @@ import (
 )
 
 // +genclient
-// +genclient:nonNamespaced
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Cluster contains information about a cluster in a cluster registry.

test/integration/server_test.go

@@ -26,6 +26,8 @@ import (
 	crclientset "k8s.io/cluster-registry/pkg/client/clientset/versioned"
 )
 
+const testNamepace = "default"
+
 func TestClusterCRUD(t *testing.T) {
 	testenv := &test.TestEnvironment{CRDs: []*v1beta1.CustomResourceDefinition{&v1alpha1.ClusterCRD}}
 
@@ -60,9 +62,10 @@ func TestClusterCRUD(t *testing.T) {
 }
 
 func testClusterCreate(t *testing.T, clientset *crclientset.Clientset, clusterName string) {
-	cluster, err := clientset.ClusterregistryV1alpha1().Clusters().Create(&v1alpha1.Cluster{
+	cluster, err := clientset.ClusterregistryV1alpha1().Clusters(testNamepace).Create(&v1alpha1.Cluster{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: clusterName,
+			Name:      clusterName,
+			Namespace: testNamepace,
 		},
 	})
 
@@ -76,7 +79,7 @@ func testClusterCreate(t *testing.T, clientset *crclientset.Clientset, clusterNa
 }
 
 func testClusterGet(t *testing.T, clientset *crclientset.Clientset, clusterName string) {
-	cluster, err := clientset.ClusterregistryV1alpha1().Clusters().Get(clusterName,
+	cluster, err := clientset.ClusterregistryV1alpha1().Clusters(testNamepace).Get(clusterName,
 		metav1.GetOptions{})
 
 	if err != nil {
@@ -89,7 +92,7 @@ func testClusterGet(t *testing.T, clientset *crclientset.Clientset, clusterName
 }
 
 func testClusterUpdate(t *testing.T, clientset *crclientset.Clientset, clusterName string) {
-	cluster, err := clientset.ClusterregistryV1alpha1().Clusters().Get(clusterName, metav1.GetOptions{})
+	cluster, err := clientset.ClusterregistryV1alpha1().Clusters(testNamepace).Get(clusterName, metav1.GetOptions{})
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
@@ -102,7 +105,7 @@ func testClusterUpdate(t *testing.T, clientset *crclientset.Clientset, clusterNa
 		},
 	}
 
-	cluster, err = clientset.ClusterregistryV1alpha1().Clusters().Update(cluster)
+	cluster, err = clientset.ClusterregistryV1alpha1().Clusters(testNamepace).Update(cluster)
 
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
@@ -117,15 +120,15 @@ func testClusterUpdate(t *testing.T, clientset *crclientset.Clientset, clusterNa
 }
 
 func testClusterDelete(t *testing.T, clientset *crclientset.Clientset, clusterName string) {
-	err := clientset.ClusterregistryV1alpha1().Clusters().Delete(clusterName,
+	err := clientset.ClusterregistryV1alpha1().Clusters(testNamepace).Delete(clusterName,
 		&metav1.DeleteOptions{})
 
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
 
 	// We do not expect to find the cluster we just deleted
-	_, err = clientset.ClusterregistryV1alpha1().Clusters().Get(clusterName, metav1.GetOptions{})
+	_, err = clientset.ClusterregistryV1alpha1().Clusters(testNamepace).Get(clusterName, metav1.GetOptions{})
 
 	if err == nil {
 		t.Fatalf("Unexpected error: %v", err)