Merge pull request #201 from projectsyn/feature/dynamic-facts

Add dynamic fact field to CRD
projectsyn · Aug 19, 2021 · 0b6221f · 0b6221f
2 parents 37ba362 + fb96c44
commit 0b6221f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/api/v1alpha1/cluster_types.go b/api/v1alpha1/cluster_types.go
@@ -51,6 +51,8 @@ type BootstrapToken struct {
 type ClusterStatus struct {
 	// BootstrapTokenValid validity of the bootstrap token, set by the Lieutenant API.
 	BootstrapToken *BootstrapToken `json:"bootstrapToken,omitempty"`
+	// Facts are key/value pairs for dynamically fetched facts
+	Facts Facts `json:"facts,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/syn.tools_clusters.yaml b/config/crd/bases/syn.tools_clusters.yaml
@@ -185,6 +185,11 @@ spec:
                     format: date-time
                     type: string
                 type: object
+              facts:
+                additionalProperties:
+                  type: string
+                description: Facts are key/value pairs for dynamically fetched facts
+                type: object
             type: object
         type: object
     served: true

diff --git a/controllers/cluster/rbac.go b/controllers/cluster/rbac.go
@@ -23,7 +23,7 @@ func createClusterRBAC(obj pipeline.Object, data *pipeline.Context) pipeline.Res
 		ObjectMeta: objMeta,
 		Rules: []rbacv1.PolicyRule{{
 			APIGroups:     []string{synv1alpha1.GroupVersion.Group},
-			Resources:     []string{"clusters"},
+			Resources:     []string{"clusters", "clusters/status"},
 			Verbs:         []string{"get", "update"},
 			ResourceNames: []string{obj.GetName()},
 		}},
@@ -41,7 +41,17 @@ func createClusterRBAC(obj pipeline.Object, data *pipeline.Context) pipeline.Res
 		}},
 	}
 	for _, item := range []client.Object{serviceAccount, role, roleBinding} {
-		if err := data.Client.Create(context.TODO(), item); err != nil && !errors.IsAlreadyExists(err) {
+		found := item.DeepCopyObject().(client.Object)
+		err := data.Client.Get(context.TODO(), client.ObjectKeyFromObject(item), found)
+		if err != nil {
+			if errors.IsNotFound(err) {
+				if err := data.Client.Create(context.TODO(), item); err != nil && !errors.IsAlreadyExists(err) {
+					return pipeline.Result{Err: err}
+				}
+			}
+			return pipeline.Result{Err: err}
+		}
+		if err := data.Client.Update(context.TODO(), item); err != nil {
 			return pipeline.Result{Err: err}
 		}
 	}