From 60f933fd43419dc8417c11fdf251595ca64d505d Mon Sep 17 00:00:00 2001
From: CJ_Clippy <cj@futureporn.net>
Date: Thu, 20 Jun 2024 17:32:22 -0800
Subject: [PATCH] specify chisel addr

---
 Makefile                                      |  4 +-
 infrastructure/controllers/grafana.yaml       | 63 -------------------
 .../controllers/kube-prometheus-stack.yaml    |  3 +-
 3 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 infrastructure/controllers/grafana.yaml

diff --git a/Makefile b/Makefile
index ea03657..c30e012 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ flux-staging:
 
 dev: kind namespaces secrets chisel velero
 
-prod: namespaces secrets velero flux-prod
+prod: namespaces secrets velero chisel flux-prod
 
-staging: namespaces secrets velero flux-staging
+staging: namespaces secrets velero chisel flux-staging
 
 velero:
 	./scripts/velero-create.sh
diff --git a/infrastructure/controllers/grafana.yaml b/infrastructure/controllers/grafana.yaml
deleted file mode 100644
index a4a0b7f..0000000
--- a/infrastructure/controllers/grafana.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: grafana
-  namespace: futureporn
-spec:
-  interval: 24h
-  url: https://grafana.github.io/helm-charts
-
----
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: grafana
-  namespace: futureporn
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: grafana
-      version: "8.0.2"
-      sourceRef:
-        kind: HelmRepository
-        name: grafana
-        namespace: futureporn
-      interval: 12h
-  values:
-    admin:
-      existingSecret: grafana
-    dashboardProviders:
-      dashboardproviders.yaml:
-        apiVersion: 1
-        providers:
-        - name: 'grafana-dashboards-kubernetes'
-          orgId: 1
-          folder: 'Kubernetes'
-          type: file
-          disableDeletion: true
-          editable: true
-          options:
-            path: /var/lib/grafana/dashboards/grafana-dashboards-kubernetes
-    dashboards:
-      grafana-dashboards-kubernetes:
-        k8s-system-api-server:
-          url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-system-api-server.json
-          token: ''
-        k8s-system-coredns:
-          url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-system-coredns.json
-          token: ''
-        k8s-views-global:
-          url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-global.json
-          token: ''
-        k8s-views-namespaces:
-          url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-namespaces.json
-          token: ''
-        k8s-views-nodes:
-          url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-nodes.json
-          token: ''
-        k8s-views-pods:
-          url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-pods.json
-          token: ''
diff --git a/infrastructure/controllers/kube-prometheus-stack.yaml b/infrastructure/controllers/kube-prometheus-stack.yaml
index 7e824c5..d55b28f 100644
--- a/infrastructure/controllers/kube-prometheus-stack.yaml
+++ b/infrastructure/controllers/kube-prometheus-stack.yaml
@@ -10,11 +10,10 @@ metadata:
   name: grafana-exit-node
   namespace: futureporn
 spec:
-  host: "{{ .Values.chisel.exitNodeIp }}"
+  host: "155.138.254.201"
   port: 9090
   auth: chisel
 
-
 ---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository