Skip to content

Commit

Permalink
Merge pull request #187 from RADAR-base/variable-version
Browse files Browse the repository at this point in the history
Chart versions are now configurable via variables
  • Loading branch information
keyvaann authored Apr 19, 2022
2 parents 7dbb7be + 514caba commit bf69998
Show file tree
Hide file tree
Showing 15 changed files with 169 additions and 124 deletions.
211 changes: 128 additions & 83 deletions etc/base.yaml

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions helmfile.d/00-init.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ releases:
- name: mongodb
namespace: graylog
chart: bitnami/mongodb
version: 10.11.1
version: {{ .Values.mongodb._chart_version }}
installed: {{ .Values.mongodb._install }}
values:
- "../etc/mongodb/values.yaml"
Expand All @@ -37,7 +37,7 @@ releases:
- name: elasticsearch
namespace: graylog
chart: elastic/elasticsearch
version: 7.12.0
version: {{ .Values.elasticsearch._chart_version }}
installed: {{ .Values.elasticsearch._install }}
values:
- "../etc/elasticsearch/values.yaml"
Expand All @@ -46,7 +46,7 @@ releases:
- name: graylog
namespace: graylog
chart: kongz/graylog
version: 1.9.2
version: {{ .Values.graylog._chart_version }}
installed: {{ .Values.graylog._install }}
values:
- "../etc/graylog/values.yaml"
Expand All @@ -64,7 +64,7 @@ releases:
- name: fluent-bit
namespace: graylog
chart: fluent/fluent-bit
version: 0.15.4
version: {{ .Values.fluent_bit._chart_version }}
installed: {{ .Values.fluent_bit._install }}
values:
- "../etc/fluent-bit/values.yaml"
Expand All @@ -76,7 +76,7 @@ releases:
installed: {{ .Values.cert_manager._install }}
disableValidation: true
chart: radar/cert-manager
version: 0.1.1
version: {{ .Values.cert_manager._chart_version }}
hooks:
- events: ["presync"]
showlogs: true
Expand All @@ -90,7 +90,7 @@ releases:

- name: kube-prometheus-stack
chart: radar/kube-prometheus-stack
version: 0.2.0
version: {{ .Values.kube_prometheus_stack._chart_version }}
wait: true
namespace: monitoring
installed: {{ .Values.kube_prometheus_stack._install }}
Expand Down Expand Up @@ -123,7 +123,7 @@ releases:

- name: nginx-ingress
chart: ingress-nginx/ingress-nginx
version: 3.25.0
version: {{ .Values.nginx_ingress._chart_version }}
force: false
installed: {{ .Values.nginx_ingress._install }}
disableValidation: true
Expand All @@ -133,7 +133,7 @@ releases:

- name: kafka-manager
chart: radar/kafka-manager
version: 2.1.5
version: {{ .Values.kafka_manager._chart_version }}
wait: false
installed: {{ .Values.kafka_manager._install }}
values:
Expand Down
8 changes: 4 additions & 4 deletions helmfile.d/10-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repositories:
releases:
- name: cp-zookeeper
chart: cp-radar/cp-zookeeper
version: 0.2.0
version: {{ .Values.cp_zookeeper._chart_version }}
wait: true
installed: {{ .Values.cp_zookeeper._install }}
values:
Expand All @@ -26,7 +26,7 @@ releases:

- name: cp-kafka
chart: cp-radar/cp-kafka
version: 0.2.0
version: {{ .Values.cp_kafka._chart_version }}
wait: true
installed: {{ .Values.cp_kafka._install }}
values:
Expand All @@ -38,7 +38,7 @@ releases:

- name: cp-schema-registry
chart: cp-radar/cp-schema-registry
version: 0.2.0
version: {{ .Values.cp_schema_registry._chart_version }}
wait: true
installed: {{ .Values.cp_schema_registry._install }}
values:
Expand All @@ -56,7 +56,7 @@ releases:

- name: catalog-server
chart: radar/catalog-server
version: 0.3.0
version: {{ .Values.catalog_server._chart_version }}
wait: true
installed: {{ .Values.catalog_server._install }}
values:
Expand Down
8 changes: 4 additions & 4 deletions helmfile.d/10-managementportal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ helmDefaults:
releases:
- name: postgresql
chart: bitnami/postgresql
version: 9.6.0
version: {{ .Values.postgresql._chart_version }}
wait: false
installed: {{ .Values.postgresql._install }}
values:
Expand All @@ -30,7 +30,7 @@ releases:

- name: management-portal
chart: radar/management-portal
version: 0.2.1
version: {{ .Values.management_portal._chart_version }}
installed: {{ .Values.management_portal._install }}
values:
- {{ .Values.management_portal | toYaml | indent 8 | trim }}
Expand Down Expand Up @@ -67,7 +67,7 @@ releases:

- name: app-config
chart: radar/app-config
version: 0.2.0
version: {{ .Values.app_config._chart_version }}
installed: {{ .Values.app_config._install }}
values:
- {{ .Values.app_config | toYaml | indent 8 | trim }}
Expand All @@ -79,7 +79,7 @@ releases:

- name: app-config-frontend
chart: radar/app-config-frontend
version: 0.2.0
version: {{ .Values.app_config._chart_version }}
installed: {{ .Values.app_config_frontend._install }}
values:
- {{ .Values.app_config_frontend | toYaml | indent 8 | trim }}
Expand Down
6 changes: 3 additions & 3 deletions helmfile.d/20-appserver.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
bases:
- ../environments.yaml

---

helmDefaults:
Expand All @@ -15,7 +15,7 @@ repositories:
releases:
- name: radar-appserver-postgresql
chart: bitnami/postgresql
version: 9.6.0
version: {{ .Values.radar_appserver_postgresql._chart_version }}
wait: false
installed: {{ .Values.radar_appserver_postgresql._install }}
values:
Expand All @@ -29,7 +29,7 @@ releases:

- name: radar-appserver
chart: radar/radar-appserver
version: 0.1.0
version: {{ .Values.radar_appserver._chart_version }}
installed: {{ .Values.radar_appserver._install }}
values:
- {{ .Values.radar_appserver | toYaml | indent 8 | trim }}
Expand Down
6 changes: 3 additions & 3 deletions helmfile.d/20-fitbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories:
releases:
- name: radar-fitbit-connector
chart: radar/radar-fitbit-connector
version: 0.2.0
version: {{ .Values.radar_fitbit_connector._chart_version }}
installed: {{ .Values.radar_fitbit_connector._install }}
values:
- {{ .Values.radar_fitbit_connector | toYaml | indent 8 | trim }}
Expand All @@ -35,7 +35,7 @@ releases:

- name: radar-rest-sources-authorizer
chart: radar/radar-rest-sources-authorizer
version: 0.3.0
version: {{ .Values.radar_rest_sources_authorizer._chart_version }}
installed: {{ .Values.radar_rest_sources_authorizer._install }}
values:
- {{ .Values.radar_rest_sources_authorizer | toYaml | indent 8 | trim }}
Expand All @@ -47,7 +47,7 @@ releases:

- name: radar-rest-sources-backend
chart: radar/radar-rest-sources-backend
version: 0.3.0
version: {{ .Values.radar_rest_sources_backend._chart_version }}
installed: {{ .Values.radar_rest_sources_backend._install }}
values:
- {{ .Values.radar_rest_sources_backend | toYaml | indent 8 | trim }}
Expand Down
6 changes: 3 additions & 3 deletions helmfile.d/20-grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repositories:
releases:
- name: timescaledb
chart: bitnami/postgresql
version: 9.6.0
version: {{ .Values.timescaledb._chart_version }}
installed: {{ .Values.timescaledb._install }}
values:
- "../etc/timescaledb/values.yaml"
Expand All @@ -32,7 +32,7 @@ releases:

- name: radar-grafana
chart: grafana/grafana
version: 6.13.0
version: {{ .Values.radar_grafana._chart_version }}
installed: {{ .Values.radar_grafana._install }}
values:
- "../etc/radar-grafana/values.yaml"
Expand Down Expand Up @@ -63,7 +63,7 @@ releases:

- name: radar-jdbc-connector
chart: radar/radar-jdbc-connector
version: 0.1.4
version: {{ .Values.radar_jdbc_connector._chart_version }}
installed: {{ .Values.radar_jdbc_connector._install }}
values:
- {{ .Values.radar_jdbc_connector | toYaml | indent 8 | trim }}
Expand Down
2 changes: 1 addition & 1 deletion helmfile.d/20-ingestion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repositories:
releases:
- name: radar-gateway
chart: radar/radar-gateway
version: 0.2.0
version: {{ .Values.radar_gateway._chart_version }}
installed: {{ .Values.radar_gateway._install }}
values:
- {{ .Values.radar_gateway | toYaml | indent 8 | trim }}
Expand Down
4 changes: 2 additions & 2 deletions helmfile.d/20-kafka-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories:
releases:
- name: radar-backend-monitor
chart: radar/radar-backend
version: 0.1.2
version: {{ .Values.radar_backend_monitor._chart_version }}
installed: {{ .Values.radar_backend_monitor._install }}
values:
- "../etc/radar-backend-monitor/values.yaml"
Expand All @@ -26,7 +26,7 @@ releases:

- name: radar-backend-stream
chart: radar/radar-backend
version: 0.1.2
version: {{ .Values.radar_backend_monitor._chart_version }}
installed: {{ .Values.radar_backend_stream._install }}
values:
- "../etc/radar-backend-stream/values.yaml"
Expand Down
2 changes: 1 addition & 1 deletion helmfile.d/20-redcap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories:
releases:
- name: radar-integration
chart: radar/radar-integration
version: 0.2.0
version: {{ .Values.radar_integration._chart_version }}
installed: {{ .Values.radar_integration._install }}
values:
- {{ .Values.radar_integration | toYaml | indent 8 | trim }}
Expand Down
10 changes: 5 additions & 5 deletions helmfile.d/20-s3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ repositories:
releases:
- name: redis
chart: bitnami/redis
version: 10.6.15
version: {{ .Values.redis._chart_version }}
installed: {{ .Values.redis._install }}
values:
- "../etc/redis/values.yaml"
- {{ .Values.redis | toYaml | indent 8 | trim }}

- name: minio
chart: minio/minio
version: 8.0.10
version: {{ .Values.minio._chart_version }}
installed: {{ .Values.minio._install }}
values:
- "../etc/minio/values.yaml"
Expand All @@ -42,7 +42,7 @@ releases:

- name: radar-s3-connector
chart: radar/radar-s3-connector
version: 0.2.0
version: {{ .Values.radar_s3_connector._chart_version }}
installed: {{ .Values.radar_s3_connector._install }}
values:
- {{ .Values.radar_s3_connector | toYaml | indent 8 | trim }}
Expand All @@ -53,14 +53,14 @@ releases:

- name: s3-proxy
chart: radar/s3-proxy
version: 0.1.2
version: {{ .Values.s3_proxy._chart_version }}
installed: {{ .Values.s3_proxy._install }}
values:
- {{ .Values.s3_proxy | toYaml | indent 8 | trim }}

- name: radar-output
chart: radar/radar-output
version: 0.2.0
version: {{ .Values.radar_output._chart_version }}
wait: true
installed: {{ .Values.radar_output._install }}
values:
Expand Down
8 changes: 4 additions & 4 deletions helmfile.d/20-upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repositories:
releases:
- name: radar-upload-postgresql
chart: bitnami/postgresql
version: 9.6.0
version: {{ .Values.radar_upload_postgresql._chart_version }}
wait: false
installed: {{ .Values.radar_upload_postgresql._install }}
values:
Expand All @@ -31,7 +31,7 @@ releases:

- name: radar-upload-connect-backend
chart: radar/radar-upload-connect-backend
version: 0.2.0
version: {{ .Values.radar_upload_connect_backend._chart_version }}
installed: {{ .Values.radar_upload_connect_backend._install }}
values:
- {{ .Values.radar_upload_connect_backend | toYaml | indent 8 | trim }}
Expand All @@ -49,7 +49,7 @@ releases:

- name: radar-upload-connect-frontend
chart: radar/radar-upload-connect-frontend
version: 0.2.0
version: {{ .Values.radar_upload_connect_frontend._chart_version }}
installed: {{ .Values.radar_upload_connect_frontend._install }}
values:
- {{ .Values.radar_upload_connect_frontend | toYaml | indent 8 | trim }}
Expand All @@ -61,7 +61,7 @@ releases:

- name: radar-upload-source-connector
chart: radar/radar-upload-source-connector
version: 0.2.0
version: {{ .Values.radar_upload_source_connector._chart_version }}
installed: {{ .Values.radar_upload_source_connector._install }}
values:
- {{ .Values.radar_upload_source_connector | toYaml | indent 8 | trim }}
Expand Down
2 changes: 1 addition & 1 deletion helmfile.d/30-confluent-cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories:
releases:
- name: cc-schema-registry-proxy
chart: radar/cc-schema-registry-proxy
version: 0.2.0
version: {{ .Values.ccSchemaRegistryProxy._chart_version }}
installed: {{ .Values.ccSchemaRegistryProxy._install }}
values:
- {{ .Values.ccSchemaRegistryProxy | toYaml | indent 8 | trim }}
Expand Down
2 changes: 1 addition & 1 deletion helmfile.d/30-push-endpoint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories:
releases:
- name: radar-push-endpoint
chart: radar/radar-push-endpoint
version: 0.1.1
version: {{ .Values.radar_push_endpoint._chart_version }}
installed: {{ .Values.radar_push_endpoint._install }}
values:
- {{ .Values.radar_push_endpoint | toYaml | indent 8 | trim }}
Expand Down
2 changes: 1 addition & 1 deletion helmfile.d/99-velero.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ releases:
- name: velero
chart: radar/velero
namespace: velero
version: 0.1.2
version: {{ .Values.velero._chart_version }}
installed: {{ .Values.velero._install }}
values:
- {{ .Values.velero | toYaml | indent 8 | trim }}

0 comments on commit bf69998

Please sign in to comment.