Merge pull request #78 from rfratto/rerender-k8s

re-render Kubernetes manifest to include fix from #71
grafana · May 20, 2020 · 7ea4c04 · 7ea4c04
2 parents 3cbb06b + 66c5507
commit 7ea4c04
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/production/kubernetes/agent.yaml b/production/kubernetes/agent.yaml
@@ -168,7 +168,7 @@ data:
                 job_name: default/kubernetes
                 kubernetes_sd_configs:
                   - role: endpoints
-                metric_label_configs:
+                metric_relabel_configs:
                   - action: drop
                     regex: apiserver_admission_controller_admission_latencies_seconds_.*
                     source_labels:

diff --git a/production/kubernetes/build/jsonnetfile.json b/production/kubernetes/build/jsonnetfile.json
@@ -1,14 +1,6 @@
 {
+  "version": 1,
   "dependencies": [
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
-          "subdir": "ksonnet-util"
-        }
-      },
-      "version": "master"
-    },
     {
       "source": {
         "git": {

diff --git a/production/kubernetes/build/jsonnetfile.lock.json b/production/kubernetes/build/jsonnetfile.lock.json
@@ -1,4 +1,5 @@
 {
+  "version": 1,
   "dependencies": [
     {
       "source": {
@@ -7,8 +8,8 @@
           "subdir": "ksonnet-util"
         }
       },
-      "version": "c19a92e586a6752f11745b47f309b13f02ef7147",
-      "sum": "LKsTTBcH8TXX5ANgRUu5I7Y1tf5le4nANFV3/W53I+c="
+      "version": "811ccb022bc2bdcd0b8281ed0a0c858c63e20542",
+      "sum": "smRyjpmKy4pURM47XTv+9azXjP6L/n4gXjxzRxAvY1Q="
     },
     {
       "source": {

diff --git a/...ion/kubernetes/build/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/kausal.libsonnet b/...ion/kubernetes/build/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/kausal.libsonnet