From 6bc6ab7af53367b702403f6155d253ff4b99a934 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Fri, 23 Oct 2020 04:15:54 -0300 Subject: [PATCH] Changing extension for create-manifest --- kubernetes/ISP-Checker-deploy.MD5 | 2 +- kubernetes/ISP-Checker-deploy.SHA512 | 2 +- kubernetes/ISP-Checker-deploy.yaml | 3 ++- kubernetes/yaml/configmap.yaml | 1 - kubernetes/yaml/{create-manifest.yaml => create-manifest.sh} | 4 ++-- kubernetes/yaml/deployment.yaml | 2 ++ 6 files changed, 8 insertions(+), 6 deletions(-) rename kubernetes/yaml/{create-manifest.yaml => create-manifest.sh} (65%) diff --git a/kubernetes/ISP-Checker-deploy.MD5 b/kubernetes/ISP-Checker-deploy.MD5 index a71b536..28a5bc7 100644 --- a/kubernetes/ISP-Checker-deploy.MD5 +++ b/kubernetes/ISP-Checker-deploy.MD5 @@ -1 +1 @@ -a4ad6e8111fd571d9694a107bb10c442 ../ISP-Checker-deploy.yaml +MD5 (../ISP-Checker-deploy.yaml) = 8cdf1b01019a8a4745aac678d0a7dce9 diff --git a/kubernetes/ISP-Checker-deploy.SHA512 b/kubernetes/ISP-Checker-deploy.SHA512 index 9b19d48..f123d51 100644 --- a/kubernetes/ISP-Checker-deploy.SHA512 +++ b/kubernetes/ISP-Checker-deploy.SHA512 @@ -1 +1 @@ -2f87e0689ea984b464efa754f0a99006c8b9716c31fc2d887fd50e067e6d284decb4e1b663ec6e65e9bfb456272b92998db1efa0dfb5fb4db520905c61fe4be0 ../ISP-Checker-deploy.yaml +SHA512 (../ISP-Checker-deploy.yaml) = fa4f4feccfb9bede2d2705b2faf0e5ebc3de416cf4815c728700e338c72813ceea834a54294dc6d11e0577892bb5bdc44e004853538ae7686741dbb519626078 diff --git a/kubernetes/ISP-Checker-deploy.yaml b/kubernetes/ISP-Checker-deploy.yaml index ea4df81..e0c5677 100644 --- a/kubernetes/ISP-Checker-deploy.yaml +++ b/kubernetes/ISP-Checker-deploy.yaml @@ -57,7 +57,6 @@ data: options: path: /var/lib/grafana/dashboards/ foldersFromFilesStructure: true - homeDashboardId: Network --- apiVersion: v1 @@ -10733,6 +10732,8 @@ spec: ports: - containerPort: 3000 env: + - name: GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH + value: /var/lib/grafana/dashboards/network-dashboard.json - name: GF_INSTALL_PLUGINS value: https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel readinessProbe: diff --git a/kubernetes/yaml/configmap.yaml b/kubernetes/yaml/configmap.yaml index 68ca98a..cbde8d4 100644 --- a/kubernetes/yaml/configmap.yaml +++ b/kubernetes/yaml/configmap.yaml @@ -20,7 +20,6 @@ data: options: path: /var/lib/grafana/dashboards/ foldersFromFilesStructure: true - homeDashboardId: Network --- apiVersion: v1 diff --git a/kubernetes/yaml/create-manifest.yaml b/kubernetes/yaml/create-manifest.sh similarity index 65% rename from kubernetes/yaml/create-manifest.yaml rename to kubernetes/yaml/create-manifest.sh index e0d48d5..0bcb6ce 100755 --- a/kubernetes/yaml/create-manifest.yaml +++ b/kubernetes/yaml/create-manifest.sh @@ -11,7 +11,7 @@ cat namespace.yaml \ deployment.yaml \ cronJob.yaml > ../ISP-Checker-deploy.yaml -sha512sum ../ISP-Checker-deploy.yaml > ../ISP-Checker-deploy.SHA512 -md5sum ../ISP-Checker-deploy.yaml > ../ISP-Checker-deploy.MD5 +sha512sum --tag ../ISP-Checker-deploy.yaml > ../ISP-Checker-deploy.SHA512 +md5sum --tag ../ISP-Checker-deploy.yaml > ../ISP-Checker-deploy.MD5 exit $? diff --git a/kubernetes/yaml/deployment.yaml b/kubernetes/yaml/deployment.yaml index 01910f9..a57a336 100644 --- a/kubernetes/yaml/deployment.yaml +++ b/kubernetes/yaml/deployment.yaml @@ -122,6 +122,8 @@ spec: ports: - containerPort: 3000 env: + - name: GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH + value: /var/lib/grafana/dashboards/network-dashboard.json - name: GF_INSTALL_PLUGINS value: https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel readinessProbe: