Add default images to modules

This commit is contained in:
CarlosEDP 2019-03-22 15:23:23 -03:00
parent a38192bbe0
commit 0f39e2fdb9
5 changed files with 28 additions and 3 deletions

View File

@ -7,7 +7,7 @@ JB_BINARY := $(GOPATH)/bin/jb
all: manifests all: manifests
manifests: jsonnet manifests: jsonnet fmt
rm -rf manifests rm -rf manifests
./scripts/build.sh main.jsonnet $(JSONNET_BIN) ./scripts/build.sh main.jsonnet $(JSONNET_BIN)

View File

@ -3,6 +3,14 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
{ {
_config+:: { _config+:: {
namespace: 'monitoring', namespace: 'monitoring',
versions+:: {
armExporter: 'latest',
},
imageRepos+:: {
armExporter: 'carlosedp/arm_exporter',
},
}, },
armExporter+:: { armExporter+:: {

View File

@ -5,6 +5,14 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'monitoring', namespace: 'monitoring',
replicas: 1, replicas: 1,
versions+:: {
elasticExporter: '1.0.2',
},
imageRepos+:: {
elasticExporter: 'justwatch/elasticsearch_exporter',
},
// Add custom dashboards // Add custom dashboards
grafanaDashboards+:: { grafanaDashboards+:: {
'elasticsearch-dashboard.json': (import 'grafana-dashboards/elasticsearch-dashboard.json'), 'elasticsearch-dashboard.json': (import 'grafana-dashboards/elasticsearch-dashboard.json'),

View File

@ -13,7 +13,6 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
+ (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet') + (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet')
+ (import 'kube-prometheus/kube-prometheus-kops-coredns.libsonnet') + (import 'kube-prometheus/kube-prometheus-kops-coredns.libsonnet')
+ (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') + (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet')
+ (import 'image_sources_versions.jsonnet')
+ (import 'base_operator_stack.jsonnet') + (import 'base_operator_stack.jsonnet')
+ (import 'smtp_server.jsonnet') + (import 'smtp_server.jsonnet')
// Additional Modules // Additional Modules
@ -21,7 +20,9 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet')
+ (if installModules.metallb then (import 'metallb.jsonnet') else {}) + (if installModules.metallb then (import 'metallb.jsonnet') else {})
+ (if installModules.traefik then (import 'traefik.jsonnet') else {}) + (if installModules.traefik then (import 'traefik.jsonnet') else {})
+ (if installModules['ups-exporter'] then (import 'ups_exporter.jsonnet') else {}) + (if installModules['ups-exporter'] then (import 'ups_exporter.jsonnet') else {})
+ (if installModules['elastic-exporter'] then (import 'elasticsearch_exporter.jsonnet') else {}); + (if installModules['elastic-exporter'] then (import 'elasticsearch_exporter.jsonnet') else {})
// Load image versions last to override default from modules
+ (import 'image_sources_versions.jsonnet');
{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } { ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) }
{ ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } + { ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } +

View File

@ -3,6 +3,14 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
{ {
_config+:: { _config+:: {
namespace: 'monitoring', namespace: 'monitoring',
versions+:: {
smtpServer: 'v1.0.1',
},
imageRepos+:: {
smtpServer: 'carlosedp/docker-smtp',
},
}, },
smtpServer+:: { smtpServer+:: {