From 6be5d378beebb6f96ea2e4d415c51a4b9eed0a7d Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Sun, 12 Feb 2023 19:55:50 +1100
Subject: [PATCH] Update prometheus ingresses

---
 adhoc-config/grafana-ingress.yml              | 27 +++++++++++
 adhoc-config/nginx-ingress-custom-config.yaml | 45 +++++++++++++++++++
 adhoc-config/prometheus-ingress.yml           | 13 +-----
 adhoc-config/prometheus-pv.yaml               |  2 +-
 4 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 adhoc-config/grafana-ingress.yml
 create mode 100644 adhoc-config/nginx-ingress-custom-config.yaml

diff --git a/adhoc-config/grafana-ingress.yml b/adhoc-config/grafana-ingress.yml
new file mode 100644
index 0000000..764da07
--- /dev/null
+++ b/adhoc-config/grafana-ingress.yml
@@ -0,0 +1,27 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: grafana-ingress
+  namespace: default
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    kubernetes.io/tls-acme: "true"
+    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+    nginx.ingress.kubernetes.io/auth-url: "https://id.junv.me/oauth2/auth"
+    nginx.ingress.kubernetes.io/auth-signin: "https://id.junv.me/oauth2/start?rd=https%3A%2F%2F$host$request_uri"
+spec:
+  tls:
+  - hosts:
+    - grafana.junv.me
+    secretName: grafana-operator-tls
+  rules:
+  - host: grafana.junv.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: grafana
+            port:
+              number: 3000
+        path: /
+        pathType: Prefix
diff --git a/adhoc-config/nginx-ingress-custom-config.yaml b/adhoc-config/nginx-ingress-custom-config.yaml
new file mode 100644
index 0000000..f25d9f0
--- /dev/null
+++ b/adhoc-config/nginx-ingress-custom-config.yaml
@@ -0,0 +1,45 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: nginx-ingress-custom-config
+  namespace: nginx-ingress
+data:
+  worker-processes: "12"
+  worker-connections: "100000"
+  worker-rlimit-nofile: "102400"
+  worker-cpu-affinity: "auto 111111111111111111111111"
+  keepalive: "200"
+  main-template: |
+    user nginx;
+    worker_processes  {{.WorkerProcesses}};
+    {{- if .WorkerRlimitNofile}}
+    worker_rlimit_nofile {{.WorkerRlimitNofile}};{{end}}
+    {{- if .WorkerCPUAffinity}}
+    worker_cpu_affinity {{.WorkerCPUAffinity}};{{end}}
+    {{- if .WorkerShutdownTimeout}}
+    worker_shutdown_timeout {{.WorkerShutdownTimeout}};{{end}}
+    daemon off;
+
+    error_log  /var/log/nginx/error.log {{.ErrorLogLevel}};
+    pid        /var/run/nginx.pid;
+
+    {{- if .MainSnippets}}
+    {{range $value := .MainSnippets}}
+    {{$value}}{{end}}
+    {{- end}}
+
+    events {
+        worker_connections  {{.WorkerConnections}};
+    }
+
+    http {
+        include       /etc/nginx/mime.types;
+        default_type  application/octet-stream;
+        sendfile        on;
+        access_log  off;
+        tcp_nopush  on;
+        tcp_nodelay on;
+        keepalive_timeout  315;
+        keepalive_requests 10000000;
+        #gzip  on;
+    }
diff --git a/adhoc-config/prometheus-ingress.yml b/adhoc-config/prometheus-ingress.yml
index 345bba8..f214c09 100644
--- a/adhoc-config/prometheus-ingress.yml
+++ b/adhoc-config/prometheus-ingress.yml
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: prometheus-operator-ingress
-  namespace: default
+  namespace: prometheus
   annotations:
     kubernetes.io/ingress.class: "nginx"
     kubernetes.io/tls-acme: "true"
@@ -12,21 +12,10 @@ metadata:
 spec:
   tls:
   - hosts:
-    - grafana.junv.me
     - prometheus.junv.me
     - alert.junv.me
     secretName: prometheus-operator-tls
   rules:
-  - host: grafana.junv.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: grafana
-            port:
-              number: 3000
-        path: /
-        pathType: Prefix
   - host: prometheus.junv.me
     http:
       paths:
diff --git a/adhoc-config/prometheus-pv.yaml b/adhoc-config/prometheus-pv.yaml
index 11ad22e..e356e2d 100644
--- a/adhoc-config/prometheus-pv.yaml
+++ b/adhoc-config/prometheus-pv.yaml
@@ -24,7 +24,7 @@ spec:
               values:
                 - server-3
 
----
+#---
 
 # kind: StorageClass
 # apiVersion: storage.k8s.io/v1