Fixing commit with a bunch of manifests

manifests/grafana-deployment.yaml

@@ -85,9 +85,6 @@ spec:
         - mountPath: /grafana-dashboard-definitions/0/namespace-by-workload
           name: grafana-dashboard-namespace-by-workload
           readOnly: false
-        - mountPath: /grafana-dashboard-definitions/0/nginx-dashboard
-          name: grafana-dashboard-nginx-dashboard
-          readOnly: false
         - mountPath: /grafana-dashboard-definitions/0/node-cluster-rsrc-use
           name: grafana-dashboard-node-cluster-rsrc-use
           readOnly: false
@@ -184,9 +181,6 @@ spec:
       - configMap:
           name: grafana-dashboard-namespace-by-workload
         name: grafana-dashboard-namespace-by-workload
-      - configMap:
-          name: grafana-dashboard-nginx-dashboard
-        name: grafana-dashboard-nginx-dashboard
       - configMap:
           name: grafana-dashboard-node-cluster-rsrc-use
         name: grafana-dashboard-node-cluster-rsrc-use

manifests/ingress-alertmanager.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: monitoring
 spec:
   rules:
-  - host: alertmanager.192.168.4.32.nip.io
+  - host: alertmanager.192.168.1.15.nip.io
     http:
       paths:
       - backend:
@@ -14,4 +14,4 @@ spec:
         path: /
   tls:
   - hosts:
-    - alertmanager.192.168.4.32.nip.io
+    - alertmanager.192.168.1.15.nip.io

manifests/ingress-grafana.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: monitoring
 spec:
   rules:
-  - host: grafana.192.168.4.32.nip.io
+  - host: grafana.192.168.1.15.nip.io
     http:
       paths:
       - backend:
@@ -14,4 +14,4 @@ spec:
         path: /
   tls:
   - hosts:
-    - grafana.192.168.4.32.nip.io
+    - grafana.192.168.1.15.nip.io

manifests/ingress-prometheus.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: monitoring
 spec:
   rules:
-  - host: prometheus.192.168.4.32.nip.io
+  - host: prometheus.192.168.1.15.nip.io
     http:
       paths:
       - backend:
@@ -14,4 +14,4 @@ spec:
         path: /
   tls:
   - hosts:
-    - prometheus.192.168.4.32.nip.io
+    - prometheus.192.168.1.15.nip.io

manifests/nginxexporter-clusterRole.yaml

@@ -1,15 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: nginx-exporter
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - services
-  - endpoints
-  - pods
-  verbs:
-  - get
-  - list
-  - watch

manifests/nginxexporter-clusterRoleBinding.yaml

@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: nginx-exporter
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: nginx-exporter
-subjects:
-- kind: ServiceAccount
-  name: nginx-exporter
-  namespace: monitoring

manifests/nginxexporter-service.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/name: ingress-nginx
-  name: nginx-ingress-metrics
-  namespace: ingress-nginx
-spec:
-  clusterIP: None
-  ports:
-  - name: prometheus
-    port: 10254
-    targetPort: 10254
-  selector:
-    app.kubernetes.io/name: ingress-nginx

manifests/nginxexporter-serviceAccount.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: nginx-exporter
-  namespace: monitoring

manifests/nginxexporter-serviceMonitor.yaml

@@ -1,26 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app: nginx
-  name: nginx
-  namespace: monitoring
-spec:
-  endpoints:
-  - interval: 30s
-    port: prometheus
-    relabelings:
-    - action: replace
-      regex: (.*)
-      replacement: $1
-      sourceLabels:
-      - __meta_kubernetes_pod_node_name
-      targetLabel: instance
-    scheme: http
-  jobLabel: nginx-exporter
-  namespaceSelector:
-    matchNames:
-    - ingress-nginx
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: ingress-nginx

manifests/prometheus-prometheus.yaml

@@ -25,7 +25,7 @@ spec:
     - name: alertmanager-main
       namespace: monitoring
       port: web
-  externalUrl: http://prometheus.192.168.4.32.nip.io
+  externalUrl: http://prometheus.192.168.1.15.nip.io
   image: prom/prometheus:v2.19.1
   nodeSelector:
     kubernetes.io/os: linux

modules/nginx.jsonnet

@@ -36,6 +36,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     serviceAccount:
       utils.newServiceAccount('nginx-exporter', $._config.namespace, null),
 
+
     clusterRoleBinding:
       utils.newClusterRoleBinding('nginx-exporter', 'nginx-exporter', $._config.namespace, 'nginx-exporter', null),
 

vars.jsonnet

@@ -44,11 +44,11 @@
 
   k3s: {
     enabled: false,
-    master_ip: ['192.168.4.32'],
+    master_ip: ['192.168.1.15'],
   },
 
   // Domain suffix for the ingresses
-  suffixDomain: '192.168.4.32.nip.io',
+  suffixDomain: '192.168.1.15.nip.io',
   // If TLSingress is true, a self-signed HTTPS ingress with redirect will be created
   TLSingress: true,
   // If UseProvidedCerts is true, provided files will be used on created HTTPS ingresses.