jsonnetfile.lock.json: Update kube-prometheus and regenerate

This commit is contained in:
zzg
2019-05-18 04:51:41 +08:00
parent 6562f95c14
commit f21a134fa4
3 changed files with 4 additions and 4 deletions

View File

@@ -14,7 +14,7 @@ all: generate fmt test
.PHONY: generate-in-docker .PHONY: generate-in-docker
generate-in-docker: generate-in-docker:
@echo ">> Compiling assets and generating Kubernetes manifests" @echo ">> Compiling assets and generating Kubernetes manifests"
$(CONTAINER_CMD) $(MAKE) $(MFLAGS) generate $(CONTAINER_CMD) make $(MFLAGS) generate
generate: manifests **.md generate: manifests **.md
@@ -42,7 +42,7 @@ test-e2e:
test-in-docker: test-in-docker:
@echo ">> Compiling assets and generating Kubernetes manifests" @echo ">> Compiling assets and generating Kubernetes manifests"
$(CONTAINER_CMD) $(MAKE) $(MFLAGS) test $(CONTAINER_CMD) make $(MFLAGS) test
$(JB_BINARY): $(JB_BINARY):
go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb

View File

@@ -8,7 +8,7 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
"version": "81b9c9f9f6886ba1fbd61b05cdf0cc4f4d95eba8" "version": "6562f95c143531d09d8c3d8629d8de98ab65a43d"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",

View File

@@ -61,7 +61,7 @@ spec:
resources: resources:
limits: limits:
cpu: 20m cpu: 20m
memory: 40Mi memory: 60Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi