Added support to label/annotate nodes

Author: soukron

clustergroup/templates/core/nodes.yaml

@@ -0,0 +1,25 @@
+{{- if not (eq .Values.enabled "plumbing") }}
+{{- range $node := .Values.clusterGroup.nodes }}
+apiVersion: v1
+kind: Node
+metadata:
+  {{- range $k, $v := $node }}
+  name: {{ $k }}
+  labels:
+    argocd.argoproj.io/managed-by: {{ $.Values.global.pattern }}-{{ $.Values.clusterGroup.name }}
+    {{- if $v.labels }}
+    {{- range $key, $value := $v.labels }}
+    {{ $key }}: {{ $value | default "" | quote }}
+    {{- end }}
+    {{- end }}
+
+    {{- if $v.annotations }}
+  annotations:
+    {{- range $key, $value := $v.annotations }}
+    {{ $key }}: {{ $value | default "" | quote }}
+    {{- end }}
+    {{- end }}{{- /* if $v.annotations */}}
+  {{- end }}{{- /* range $k, $v := $node */}}
+---
+{{- end -}}
+{{- end -}}

clustergroup/values.schema.json

@@ -271,6 +271,20 @@
             "$ref": "#/definitions/Namespaces"
           }
         },
+        "nodes": {
+          "anyOf": [
+            {
+              "type": "array"
+            },
+            {
+              "type": "object"
+            }
+          ],
+          "description": "Description of those nodes which ArgoCD will control the labels and/or annotations.",
+          "items": {
+            "$ref": "#/definitions/Nodes"
+          }
+        },
         "indexImages": {
           "anyOf": [
             {
@@ -389,28 +403,51 @@
           "type": "string"
         }
       ],
-	  "description": "Description of the applications that will be created in the ArgoCD instances. The Application CRD is the Kubernetes resource object representing a deployed application instance in an environment. Two ways of defining applications: Using a list or using a dictionary.",
-	  "additionalProperties": true,
-	  "properties": {
-         "name": {
-		    "type": "string",
-		    "description": "Name of the namespace."
-          },
-	      "labels": {
-		    "type": "array",
-		    "items": {
-		      "$ref": "#/definitions/NameValue"
-		    }
-	      },
-	      "annotations": {
-		    "type": "array",
-		    "items": {
-		      "$ref": "#/definitions/NameValue"
-		    }
-	      }
+      "description": "Description of the applications that will be created in the ArgoCD instances. The Application CRD is the Kubernetes resource object representing a deployed application instance in an environment. Two ways of defining applications: Using a list or using a dictionary.",
+      "additionalProperties": true,
+      "properties": {
+        "name": {
+	  "type": "string",
+	  "description": "Name of the namespace."
+        },
+	"labels": {
+	  "type": "array",
+	  "items": {
+            "$ref": "#/definitions/NameValue"
+	  }
+	},
+	"annotations": {
+          "type": "array",
+	  "items": {
+	    "$ref": "#/definitions/NameValue"
 	  }
+	}
+      }
     },
-	"NameValue": {
+    "Nodes": {
+      "type": "object",
+      "description": "Description of those nodes which ArgoCD will control the labels and/or annotations.",
+      "additionalProperties": true,
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the node."
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NameValue"
+          }
+        },
+	"annotations": {
+          "type": "array",
+	  "items": {
+	    "$ref": "#/definitions/NameValue"
+	  }
+	}
+      }
+    },
+    "NameValue": {
       "type": "object",
       "description": "Description of the applications that will be created in the ArgoCD instances. The Application CRD is the Kubernetes resource object representing a deployed application instance in an environment. Two ways of defining applications: Using a list or using a dictionary.",
       "additionalProperties": true,
@@ -423,8 +460,8 @@
           "type": "string",
           "description": "Name of the namespace."
         }
-	  }
-	},
+      }
+    },
     "Applications": {
       "type": "object",
       "description": "Description of the applications that will be created in the ArgoCD instances. The Application CRD is the Kubernetes resource object representing a deployed application instance in an environment. Two ways of defining applications: Using a list or using a dictionary.",

clustergroup/values.yaml

@@ -10,7 +10,6 @@ global:
     installPlanApproval: Automatic
     applicationRetryLimit: 20
 
-
 enabled: "all"
 
 # Note that sometimes changing helm values might require a hard refresh (https://github.com/helm/helm/issues/3486)
@@ -73,6 +72,12 @@ clusterGroup:
 #          - OpenShift
 #
 #  - open-cluster-management
+#
+  nodes: []
+#  nodes:
+#  - m-m00.mycluster.domain.tld:
+#      labels:
+#        cluster.ocs.openshift.io/openshift-storage: ""
 #
   subscriptions: {}
 #  - name: advanced-cluster-management

examples/values-example.yaml

@@ -50,6 +50,17 @@ clusterGroup:
   - include-default-og:
       operatorGroup: true
 
+  nodes:
+  - m-m00.cluster.example.tld:
+      labels:
+        cluster.ocs.openshift.io/openshift-storage: ""
+  - m-m01.cluster.example.tld:
+      labels:
+        cluster.ocs.openshift.io/openshift-storage: ""
+  - m-m02.cluster.example.tld:
+      labels:
+        cluster.ocs.openshift.io/openshift-storage: ""
+
   operatorgroupExcludes:
   - exclude-og
 

tests/clustergroup-industrial-edge-factory.expected.yaml

@@ -152,6 +152,7 @@ data:
       - manuela-stormshift-machine-sensor
       - manuela-stormshift-messaging
       - manuela-factory-ml-workspace
+      nodes: []
       operatorgroupExcludes:
       - manuela-factory-ml-workspace
       projects:

tests/clustergroup-industrial-edge-hub.expected.yaml

@@ -291,6 +291,7 @@ data:
       - manuela-data-lake
       - staging
       - vault
+      nodes: []
       operatorgroupExcludes:
       - manuela-ml-workspace
       projects:

tests/clustergroup-medical-diagnosis-hub.expected.yaml

@@ -270,6 +270,7 @@ data:
       - staging
       - vault
       - golang-external-secrets
+      nodes: []
       projects:
       - hub
       - medical-diagnosis

tests/clustergroup-naked.expected.yaml

@@ -73,6 +73,7 @@ data:
       managedClusterGroups: {}
       name: example
       namespaces: []
+      nodes: []
       projects: []
       sharedValueFiles: []
       subscriptions: {}

tests/clustergroup-normal.expected.yaml

@@ -234,6 +234,16 @@ data:
           operatorGroup: false
       - include-default-og:
           operatorGroup: true
+      nodes:
+      - m-m00.cluster.example.tld:
+          labels:
+            cluster.ocs.openshift.io/openshift-storage: ""
+      - m-m01.cluster.example.tld:
+          labels:
+            cluster.ocs.openshift.io/openshift-storage: ""
+      - m-m02.cluster.example.tld:
+          labels:
+            cluster.ocs.openshift.io/openshift-storage: ""
       operatorgroupExcludes:
       - exclude-og
       projects:
@@ -1174,6 +1184,33 @@ spec:
   location: ApplicationMenu
   text: 'Example ArgoCD'
 ---
+# Source: clustergroup/templates/core/nodes.yaml
+apiVersion: v1
+kind: Node
+metadata:
+  name: m-m00.cluster.example.tld
+  labels:
+    argocd.argoproj.io/managed-by: mypattern-example
+    cluster.ocs.openshift.io/openshift-storage: ""
+---
+# Source: clustergroup/templates/core/nodes.yaml
+apiVersion: v1
+kind: Node
+metadata:
+  name: m-m01.cluster.example.tld
+  labels:
+    argocd.argoproj.io/managed-by: mypattern-example
+    cluster.ocs.openshift.io/openshift-storage: ""
+---
+# Source: clustergroup/templates/core/nodes.yaml
+apiVersion: v1
+kind: Node
+metadata:
+  name: m-m02.cluster.example.tld
+  labels:
+    argocd.argoproj.io/managed-by: mypattern-example
+    cluster.ocs.openshift.io/openshift-storage: ""
+---
 # Source: clustergroup/templates/core/operatorgroup.yaml
 ---
 apiVersion: operators.coreos.com/v1