Merge pull request #122 from openebs/ver_60

cherry pick #121 removing unused jsonnet modules

Author: abhilashshetty04

.github/workflows/jsonnet-lint.yml

@@ -21,10 +21,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Jsonnet formatter
+      - name: Jsonnet formatter and linter
         run: |
-          cd jsonnet && make --always-make fmt
-
-      - name: Jsonnet linter
-        run: |
-          cd jsonnet && make --always-make lint
+          cd jsonnet && make --always-make all
+          

deploy/charts/Chart.yaml

@@ -22,12 +22,12 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.0.0
+version: 4.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.0.0
+appVersion: 4.0.1
 
 dependencies:
   - name: kube-prometheus-stack

deploy/charts/README.md

@@ -80,5 +80,8 @@ Usage:
 {{- range $subchart }}
 {{- $values = index $values . }}
 {{- end }}
-{{- include $template (dict "Chart" (dict "Name" (last $subchart)) "Values" $values "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
+{{- if $values.enabled }}
+  {{- include $template (dict "Chart" (dict "Name" (last $subchart)) "Values" $values "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
 {{- end }}
+{{- end }}
+

deploy/charts/templates/_helpers.tpl

@@ -39,9 +39,9 @@ kube-prometheus-stack:
 
     ## Additional container arguments
     extraArgs:
-      - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)
-      - --collector.filesystem.ignored-fs-types=^(tmpfs|autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$
-      - --collector.diskstats.ignored-devices=^(ram|loop|fd|(h|s|v|xv)d[a-z]+|nvme\\d+n\\d+p)\\d+$
+      - --collector.filesystem.mount-points-exclude=^/(dev|proc|sys|var/lib/docker/.+)($|/)
+      - --collector.filesystem.fs-types-exclude=^(tmpfs|autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$
+      - --collector.diskstats.device-exclude=^(ram|loop|fd|sr|(h|s|v|xv)d[a-z]+|nvme\d+n\d+p|nvme\d+c\d+n)\d+$
 
   prometheus:
     service:

deploy/charts/values.yaml

@@ -2,45 +2,30 @@ SHELL=/usr/bin/env bash -o pipefail
 
 BIN_DIR?=$(shell pwd)/tmp/bin
 
-EMBEDMD_BIN=$(BIN_DIR)/embedmd
 JB_BIN=$(BIN_DIR)/jb
-GOJSONTOYAML_BIN=$(BIN_DIR)/gojsontoyaml
 JSONNET_BIN=$(BIN_DIR)/jsonnet
 JSONNETLINT_BIN=$(BIN_DIR)/jsonnet-lint
 JSONNETFMT_BIN=$(BIN_DIR)/jsonnetfmt
-KUBECONFORM_BIN=$(BIN_DIR)/kubeconform
-TOOLING=$(EMBEDMD_BIN) $(JB_BIN) $(GOJSONTOYAML_BIN) $(JSONNET_BIN) $(JSONNETLINT_BIN) $(JSONNETFMT_BIN) $(KUBECONFORM_BIN)
+TOOLING=$(JB_BIN) $(JSONNET_BIN) $(JSONNETLINT_BIN) $(JSONNETFMT_BIN)
 
 JSONNETFMT_ARGS=-n 2 --max-blank-lines 2 --string-style s --comment-style s
 
-KUBE_VERSION?="1.20.0"
-
-all:  lint fmt generate
+all:  lint fmt
 
 .PHONY: clean
 clean:
 	# Remove all files and directories ignored by git.
 	git clean -Xfd .
 
-.PHONY: generate
-generate: manifests 
-
-manifests: main.jsonnet $(GOJSONTOYAML_BIN) vendor buildscripts/build.sh
-	./buildscripts/build.sh $<
-
-vendor: $(JB_BIN) jsonnetfile.json jsonnetfile.lock.json
-	rm -rf vendor
-	$(JB_BIN) install	
-
 .PHONY: fmt
 fmt: $(JSONNETFMT_BIN)
-	find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \
+	find . -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \
 		xargs -n 1 -- $(JSONNETFMT_BIN) $(JSONNETFMT_ARGS) -i
 
 .PHONY: lint
-lint: $(JSONNETLINT_BIN) vendor
-	find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \
-		xargs -n 1 -- $(JSONNETLINT_BIN) -J vendor
+lint: $(JSONNETLINT_BIN)
+	find . -name '*.libsonnet' -print -o -name '*.jsonnet' -print | \
+		xargs -n 1 -- $(JSONNETLINT_BIN)
 
 
 $(BIN_DIR):