b3169efa35
Updated stx-monitor to use official Elastic 7.6.0 helm-charts for Kibana, Filebeat, Metricbeat and Logstash. This change included updating the helm-elastic tarball sha to the newest release and updating helm-elastic patches accordingly. Patched the charts to support previous stx-monitor functionality and updated the manifest to conform to the new config format. Change-Id: I03b356b2b7acda0fc8336704784bd870252dd5b8
62 lines
1.4 KiB
Diff
62 lines
1.4 KiB
Diff
From c9c3e8ff214360eb2e5d9e7728b7bee8fe771eea Mon Sep 17 00:00:00 2001
|
|
From: Kevin Smith <kevin.smith@windriver.com>
|
|
Date: Tue, 1 Oct 2019 15:25:32 -0400
|
|
Subject: [PATCH 1/1] add makefile
|
|
|
|
---
|
|
Makefile | 44 +++++++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 43 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 00e154d..5cf4447
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,1 +1,43 @@
|
|
-include helpers/common.mk
|
|
+#
|
|
+# Copyright 2017 The Openstack-Helm Authors.
|
|
+#
|
|
+# Copyright (c) 2018 Wind River Systems, Inc.
|
|
+#
|
|
+# SPDX-License-Identifier: Apache-2.0
|
|
+#
|
|
+# It's necessary to set this because some environments don't link sh -> bash.
|
|
+SHELL := /bin/bash
|
|
+TASK := build
|
|
+
|
|
+EXCLUDES := helm-toolkit doc tests tools logs tmp
|
|
+CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
|
|
+
|
|
+.PHONY: $(EXCLUDES) $(CHARTS)
|
|
+
|
|
+all: $(CHARTS)
|
|
+
|
|
+$(CHARTS):
|
|
+ @if [ -d $@ ]; then \
|
|
+ echo; \
|
|
+ echo "===== Processing [$@] chart ====="; \
|
|
+ make $(TASK)-$@; \
|
|
+ fi
|
|
+
|
|
+init-%:
|
|
+ if [ -f $*/Makefile ]; then make -C $*; fi
|
|
+ if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
|
|
+
|
|
+lint-%: init-%
|
|
+ if [ -d $* ]; then helm lint $*; fi
|
|
+
|
|
+build-%: lint-%
|
|
+ if [ -d $* ]; then helm package $*; fi
|
|
+
|
|
+clean:
|
|
+ @echo "Clean all build artifacts"
|
|
+ rm -f */templates/_partials.tpl */templates/_globals.tpl
|
|
+ rm -f *tgz */charts/*tgz */requirements.lock
|
|
+ rm -rf */charts */tmpcharts
|
|
+
|
|
+%:
|
|
+ @:
|
|
--
|
|
1.8.3.1
|
|
|