Merge pull request #21 from mhjacks/exclude_infra_nodes_by_default

[WIP] Improvements to labelling job - allow label selector to be passed as value (to avoid, e.g. submariner) and ensure at least 3 nodes labelled

Author: mbaldessari

Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.2
+version: 0.2.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

README.md

@@ -1,12 +1,16 @@
 # openshift-data-foundations
 
-![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A Helm chart to install ODF on Openshift
 
 ### Notable changes
 
+* v0.2.3: Allow passing of label selector to labelling job to avoid, for example, labelling submariner nodes.
+          Also ensure at least 3 nodes are labelled when using label selector.
+
 * v0.2.2: Reconfigure sync ordering to ensure label job runs before attempts to create storagecluster/storagesystem
+
 * v0.2.1: Introduce boolean to configure where mirroring is enabled. Needed for RamenDR. Defaults to false
 
 **Homepage:** <https://github.com/validatedpatterns/openshift-data-foundations-chart>
@@ -81,6 +85,7 @@ default failure domain for objectStorage.
 | route.service.weight | int | `100` |  |
 | serviceAccountName | string | `"odf-node-label-sa"` |  |
 | storageSystem.deploy | bool | `false` |  |
+| storageSystem.inventory.nodeJobLabelSelector | string | `"node-role.kubernetes.io/worker="` |  |
 | storageSystem.inventory.nodes[0] | string | `"nodeA"` |  |
 | storageSystem.inventory.nodes[1] | string | `"nodeB"` |  |
 | storageSystem.inventory.nodes[2] | string | `"nodeC"` |  |

README.md.gotmpl

@@ -7,7 +7,11 @@
 
 ### Notable changes
 
+* v0.2.3: Allow passing of label selector to labelling job to avoid, for example, labelling submariner nodes.
+          Also ensure at least 3 nodes are labelled when using label selector.
+
 * v0.2.2: Reconfigure sync ordering to ensure label job runs before attempts to create storagecluster/storagesystem
+
 * v0.2.1: Introduce boolean to configure where mirroring is enabled. Needed for RamenDR. Defaults to false
 
 {{ template "chart.homepageLine" . }}

templates/job-labelNodes.yaml

@@ -19,7 +19,13 @@ spec:
           oc label node {{ . }} cluster.ocs.openshift.io/openshift-storage='' --overwrite
           {{- end }}
           {{- else }}
-          oc label nodes -l node-role.kubernetes.io/worker= cluster.ocs.openshift.io/openshift-storage='' --overwrite
+          oc label nodes -l {{ $.Values.storageSystem.inventory.nodeJobLabelSelector | squote }} cluster.ocs.openshift.io/openshift-storage='' --overwrite
+          LABELED_COUNT=$(oc get nodes -l cluster.ocs.openshift.io/openshift-storage --no-headers 2>/dev/null | wc -l)
+          if [ "$LABELED_COUNT" -lt 3 ]; then
+            echo "Error: Only $LABELED_COUNT node(s) were labeled. At least 3 nodes must be labeled."
+            exit 1
+          fi
+          echo "Successfully labeled $LABELED_COUNT node(s)"
           {{- end }}
         name: label-storage-nodes
       dnsPolicy: ClusterFirst

values.yaml

@@ -70,6 +70,7 @@ objectStorage:
 #Define the odf storageSystem parameters
 storageSystem:
   inventory:
+    nodeJobLabelSelector: 'node-role.kubernetes.io/worker='
     useSpecificNodes: true # true/false to label a specific set of nodes to be part of ODF
     nodes: # At least specify three nodes
       - nodeA