Services now exposed/proxied via nodeports

Author: wtripp180901

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

@@ -52,16 +52,7 @@ kube_prometheus_stack_release_defaults:
       KubeProxyDown: true
       KubeControllerManagerDown: true
   prometheus:
-    ingress:
-      enabled: true
-      hosts:
-        - "{{ control_sslip }}"
-        - "localhost"
-      ingressClassName: traefik
-      paths:
-        - /prometheus
     prometheusSpec:
-      routePrefix: /prometheus
       externalUrl: "{{ kube_prometheus_stack_prometheus_external_url }}"
       podMonitorSelectorNilUsesHelmValues: false
       serviceMonitorSelectorNilUsesHelmValues: false
@@ -103,19 +94,15 @@ kube_prometheus_stack_release_defaults:
     service:
       port: "{{ grafana_port }}"
     ingress:
-      enabled: true
-      # hosts:
-      #   - "{{ control_sslip }}"
-      #   - "localhost"
-      ingressClassName: traefik
-      path: /
+      path: /node/{{ groups['grafana'].0 }}/30001
     sidecar:
       dashboards:
         searchNamespace: ALL
     grafana.ini:
       server:
         domain: "{{ openondemand_servername }}"
         root_url: "{{ grafana_url_openondemand_proxy }}"
+        serve_from_sub_path: true
       auth: "{{ grafana_auth }}"
       auth.anonymous:
         enabled: "{{ grafana_anonymous_auth }}"
@@ -140,21 +127,12 @@ kube_prometheus_stack_release_defaults:
     env: "{{ grafana_environment }}"
 
   alertmanager:
-    ingress:
-      enabled: true
-      # hosts:
-      #   - "{{ control_sslip }}"
-      #   - "localhost"
-      ingressClassName: traefik
-      paths: 
-        - /alertmanager
     # Don't apply the namespace grouping by default
     config: "{{ alertmanager_config }}"
     alertmanagerSpec:
       image:
         tag: "{{ alertmanager_image_tag }}"
       forceEnableClusterMode: true
-      routePrefix: /alertmanager
       externalUrl: "{{ kube_prometheus_stack_alertmanager_external_url }}"
       # Make sure that alertmanager finds configurations with the alertmanager name as a label
       alertmanagerConfigSelector:

ansible/roles/kube_prometheus_stack/tasks/main.yml

@@ -193,3 +193,46 @@
     create_namespace: no
     wait: yes
     wait_timeout: "{{ kube_prometheus_stack_wait_timeout }}"
+
+# Again can't loop through these because the k8s module doesn't like templating ints
+- name: Opening NodePort for Prometheus
+  kubernetes.core.k8s:
+    namespace: "{{ kube_prometheus_stack_release_namespace }}"
+    name: prometheus-external
+    definition:
+      kind: Service
+      spec:
+        type: NodePort
+        selector:
+          app.kubernetes.io/name: prometheus
+        ports:
+          - port: 9090
+            nodePort: 30000
+
+- name: Opening NodePort for Grafana
+  kubernetes.core.k8s:
+    namespace: "{{ kube_prometheus_stack_release_namespace }}"
+    name: grafana-external
+    definition:
+      kind: Service
+      spec:
+        type: NodePort
+        selector:
+          app.kubernetes.io/name: grafana
+        ports:
+          - port: 3000
+            nodePort: 30001
+
+- name: Opening NodePort for Alertmanager
+  kubernetes.core.k8s:
+    namespace: "{{ kube_prometheus_stack_release_namespace }}"
+    name: alertmanager-external
+    definition:
+      kind: Service
+      spec:
+        type: NodePort
+        selector:
+          app.kubernetes.io/name: alertmanager
+        ports:
+          - port: 9093
+            nodePort: 30002

environments/common/inventory/group_vars/all/grafana.yml

@@ -16,7 +16,7 @@ grafana_api_url: "http://{{ grafana_api_address }}:{{ grafana_port }}"
 
 # Configure external address, with external URL depending on whether we are using Open Ondemand as a proxy
 grafana_url_direct: "http://{{ grafana_address }}:{{ grafana_port }}"
-grafana_url_openondemand_proxy: "http://{{ openondemand_servername | default('') }}/rnode/{{ groups['grafana'].0 }}/{{ grafana_port }}"
+grafana_url_openondemand_proxy: "https://{{ openondemand_servername | default('') }}/node/{{ groups['grafana'].0 }}/30001"
 grafana_url: "{{ grafana_url_openondemand_proxy if groups['openondemand'] | count > 0 else grafana_url_direct }}"
 grafana_serve_from_sub_path: "{{ groups['openondemand'] | count > 0 }}"