nodeselectors now use custom labels

Author: wtripp180901

ansible/roles/k3s/tasks/main.yml

@@ -28,8 +28,8 @@
       INSTALL_K3S_BIN_DIR: "/usr/bin"
     changed_when: true
     loop:
-      - server --disable=traefik
-      - agent
+      - server --disable=traefik --node-label clusterrole=server
+      - agent --node-label clusterrole=agent
 
 - name: Install helm
   unarchive:

ansible/roles/kube_prometheus_stack/defaults/main/helm.yml

@@ -43,8 +43,6 @@ kube_prometheus_stack_prometheus_external_url: >-
     else ""
   }}
 
-control_hostname: "{{ ( openhpc_cluster_name + '-control.'+ openhpc_cluster_name + '.' + cluster_domain_suffix ) | lower }}"
-
 # The values for the kube-prometheus-stack release
 kube_prometheus_stack_release_defaults:
   defaultRules:
@@ -91,7 +89,7 @@ kube_prometheus_stack_release_defaults:
         runAsGroup: 0
         fsGroup: 0
       nodeSelector:
-        kubernetes.io/hostname: "{{ control_hostname }}"
+        clusterrole: "server"
 
   additionalPrometheusRulesMap: "{{ prometheus_alert_rules }}"
 
@@ -122,7 +120,7 @@ kube_prometheus_stack_release_defaults:
     additionalDataSources: "{{ grafana_datasources }}"
     plugins: "{{ grafana_plugins }}"
     nodeSelector:
-        kubernetes.io/hostname: "{{ control_hostname }}"
+        clusterrole: "server"
     persistence:
       type: pvc
       enabled: true
@@ -155,7 +153,7 @@ kube_prometheus_stack_release_defaults:
       alertmanagerConfigMatcherStrategy:
         type: None
       nodeSelector:
-        kubernetes.io/hostname: "{{ control_hostname }}"
+        clusterrole: "server"
       scheme: "{{ prometheus_alertmanager_config.scheme | default( '' ) }}"
     serviceMonitor:
       scheme: "{{ prometheus_alertmanager_config.scheme | default( '' ) }}"
@@ -165,11 +163,11 @@ kube_prometheus_stack_release_defaults:
 
   prometheusOperator:
     nodeSelector:
-        kubernetes.io/hostname: "{{ control_hostname }}"
+        clusterrole: "server"
 
   kube-state-metrics:
     nodeSelector:
-        kubernetes.io/hostname: "{{ control_hostname }}"
+        clusterrole: "server"
 
   prometheus-node-exporter:
     image: