From f21a134fa4936e33cfe3ce91807c97c7edfb86e3 Mon Sep 17 00:00:00 2001
From: zzg <zg.zhu@daocloud.io>
Date: Sat, 18 May 2019 04:51:41 +0800
Subject: [PATCH] jsonnetfile.lock.json: Update kube-prometheus and regenerate
---
Makefile | 4 ++--
jsonnetfile.lock.json | 2 +-
manifests/node-exporter-daemonset.yaml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index bc6ded2d..b41d0c51 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ all: generate fmt test
.PHONY: generate-in-docker
generate-in-docker:
@echo ">> Compiling assets and generating Kubernetes manifests"
- $(CONTAINER_CMD) $(MAKE) $(MFLAGS) generate
+ $(CONTAINER_CMD) make $(MFLAGS) generate
generate: manifests **.md
@@ -42,7 +42,7 @@ test-e2e:
test-in-docker:
@echo ">> Compiling assets and generating Kubernetes manifests"
- $(CONTAINER_CMD) $(MAKE) $(MFLAGS) test
+ $(CONTAINER_CMD) make $(MFLAGS) test
$(JB_BINARY):
go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index dd279a2a..c78b87c2 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "jsonnet/kube-prometheus"
}
},
- "version": "81b9c9f9f6886ba1fbd61b05cdf0cc4f4d95eba8"
+ "version": "6562f95c143531d09d8c3d8629d8de98ab65a43d"
},
{
"name": "ksonnet",
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index f0729b5d..913f90ee 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -61,7 +61,7 @@ spec:
resources:
limits:
cpu: 20m
- memory: 40Mi
+ memory: 60Mi
requests:
cpu: 10m
memory: 20Mi
--
GitLab