diff --git a/trains/community/influxdb/1.0.17/README.md b/trains/community/influxdb/1.1.0/README.md similarity index 100% rename from trains/community/influxdb/1.0.17/README.md rename to trains/community/influxdb/1.1.0/README.md diff --git a/trains/community/influxdb/1.0.17/app.yaml b/trains/community/influxdb/1.1.0/app.yaml similarity index 98% rename from trains/community/influxdb/1.0.17/app.yaml rename to trains/community/influxdb/1.1.0/app.yaml index 8f881048a7..edf82a3ea7 100644 --- a/trains/community/influxdb/1.0.17/app.yaml +++ b/trains/community/influxdb/1.1.0/app.yaml @@ -29,4 +29,4 @@ sources: - https://github.com/influxdata/influxdata-docker title: InfluxDB train: community -version: 1.0.17 +version: 1.1.0 diff --git a/trains/community/influxdb/1.0.17/ix_values.yaml b/trains/community/influxdb/1.1.0/ix_values.yaml similarity index 62% rename from trains/community/influxdb/1.0.17/ix_values.yaml rename to trains/community/influxdb/1.1.0/ix_values.yaml index 79620e712d..4d1e918caf 100644 --- a/trains/community/influxdb/1.0.17/ix_values.yaml +++ b/trains/community/influxdb/1.1.0/ix_values.yaml @@ -6,3 +6,5 @@ images: consts: influx_container_name: influxdb perms_container_name: permissions + ssl_key_path: /certs/influxdb_key.pem + ssl_cert_path: /certs/influxdb_cert.pem diff --git a/trains/community/influxdb/1.0.17/questions.yaml b/trains/community/influxdb/1.1.0/questions.yaml similarity index 98% rename from trains/community/influxdb/1.0.17/questions.yaml rename to trains/community/influxdb/1.1.0/questions.yaml index abf7ef2f08..0de2e65ac8 100644 --- a/trains/community/influxdb/1.0.17/questions.yaml +++ b/trains/community/influxdb/1.1.0/questions.yaml @@ -131,6 +131,14 @@ questions: schema: type: boolean default: false + - variable: certificate_id + label: Certificate + description: The certificate to use for InfluxDB. + schema: + type: int + "null": true + $ref: + - "definitions/certificate" - variable: storage label: "" group: Storage Configuration diff --git a/trains/community/influxdb/1.0.17/templates/docker-compose.yaml b/trains/community/influxdb/1.1.0/templates/docker-compose.yaml similarity index 68% rename from trains/community/influxdb/1.0.17/templates/docker-compose.yaml rename to trains/community/influxdb/1.1.0/templates/docker-compose.yaml index f64f8db964..3ab5195893 100644 --- a/trains/community/influxdb/1.0.17/templates/docker-compose.yaml +++ b/trains/community/influxdb/1.1.0/templates/docker-compose.yaml @@ -3,14 +3,23 @@ {% set c1 = tpl.add_container(values.consts.influx_container_name, "image") %} {% set perm_container = tpl.deps.perms(values.consts.perms_container_name) %} {% set perms_config = {"uid": values.run_as.user, "gid": values.run_as.group, "mode": "check"} %} +{% set scheme = "https" if values.network.certificate_id else "http" %} {% do c1.set_user(values.run_as.user, values.run_as.group) %} -{% do c1.healthcheck.set_test("curl", {"port": values.network.web_port.port_number, "path": "/health"}) %} +{% do c1.healthcheck.set_test("curl", {"port": values.network.web_port.port_number, "path": "/health", "scheme": scheme}) %} {% do c1.environment.add_env("INFLUXD_HTTP_BIND_ADDRESS", ":%d"|format(values.network.web_port.port_number)) %} {% do c1.environment.add_user_envs(values.influxdb.additional_envs) %} -{% do c1.add_port(values.network.web_port) %} +{% if values.network.certificate_id %} + {% set cert = values.ix_certificates[values.network.certificate_id] %} + {% do c1.configs.add("private", cert.privatekey, values.consts.ssl_key_path) %} + {% do c1.configs.add("public", cert.certificate, values.consts.ssl_cert_path) %} + {% do c1.environment.add_env("INFLUXD_TLS_KEY", values.consts.ssl_key_path) %} + {% do c1.environment.add_env("INFLUXD_TLS_CERT", values.consts.ssl_cert_path) %} +{% endif %} + +{% do c1.add_port(values.network.web_port, {"scheme": scheme}) %} {% do c1.add_storage("/var/lib/influxdb2", values.storage.data) %} {% do perm_container.add_or_skip_action("data", values.storage.data, perms_config) %} diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/__init__.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/__init__.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/__init__.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/__init__.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/client.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/client.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/client.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/client.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/configs.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/configs.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/configs.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/configs.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/container.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/container.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/container.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/container.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/depends.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/depends.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/depends.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/depends.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deploy.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deploy.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deploy.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deploy.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_elastic.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_elastic.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_elastic.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_elastic.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_mariadb.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_mariadb.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_mariadb.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_mariadb.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_meilisearch.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_meilisearch.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_meilisearch.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_meilisearch.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_mongodb.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_mongodb.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_mongodb.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_mongodb.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_perms.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_perms.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_perms.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_perms.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_postgres.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_postgres.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_postgres.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_postgres.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_redis.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_redis.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_redis.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_redis.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_solr.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_solr.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/deps_solr.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/deps_solr.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/device.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/device.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/device.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/device.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/device_cgroup_rules.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/device_cgroup_rules.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/device_cgroup_rules.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/device_cgroup_rules.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/devices.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/devices.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/devices.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/devices.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/dns.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/dns.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/dns.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/dns.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/environment.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/environment.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/environment.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/environment.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/error.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/error.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/error.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/error.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/expose.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/expose.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/expose.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/expose.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/extra_hosts.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/extra_hosts.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/extra_hosts.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/extra_hosts.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/formatter.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/formatter.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/formatter.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/formatter.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/functions.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/functions.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/functions.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/functions.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/healthcheck.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/healthcheck.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/healthcheck.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/healthcheck.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/labels.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/labels.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/labels.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/labels.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/notes.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/notes.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/notes.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/notes.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/portals.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/portals.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/portals.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/portals.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/ports.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/ports.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/ports.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/ports.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/render.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/render.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/render.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/render.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/resources.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/resources.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/resources.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/resources.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/restart.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/restart.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/restart.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/restart.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/security_opts.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/security_opts.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/security_opts.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/security_opts.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/storage.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/storage.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/storage.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/storage.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/sysctls.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/sysctls.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/sysctls.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/sysctls.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/__init__.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/__init__.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/__init__.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/__init__.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_build_image.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_build_image.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_build_image.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_build_image.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_configs.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_configs.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_configs.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_configs.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_container.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_container.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_container.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_container.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_depends.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_depends.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_depends.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_depends.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_deps.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_deps.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_deps.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_deps.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_device.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_device.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_device.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_device.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_device_cgroup_rules.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_device_cgroup_rules.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_device_cgroup_rules.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_device_cgroup_rules.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_dns.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_dns.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_dns.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_dns.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_environment.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_environment.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_environment.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_environment.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_expose.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_expose.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_expose.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_expose.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_extra_hosts.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_extra_hosts.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_extra_hosts.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_extra_hosts.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_formatter.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_formatter.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_formatter.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_formatter.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_functions.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_functions.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_functions.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_functions.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_healthcheck.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_healthcheck.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_healthcheck.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_healthcheck.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_labels.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_labels.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_labels.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_labels.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_notes.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_notes.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_notes.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_notes.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_portal.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_portal.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_portal.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_portal.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_ports.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_ports.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_ports.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_ports.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_render.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_render.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_render.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_render.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_resources.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_resources.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_resources.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_resources.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_restart.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_restart.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_restart.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_restart.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_security_opts.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_security_opts.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_security_opts.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_security_opts.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_sysctls.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_sysctls.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_sysctls.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_sysctls.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_validations.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_validations.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_validations.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_validations.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_volumes.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_volumes.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tests/test_volumes.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tests/test_volumes.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tmpfs.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tmpfs.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/tmpfs.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/tmpfs.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/validations.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/validations.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/validations.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/validations.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_mount.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_mount.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_mount.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_mount.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_mount_types.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_mount_types.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_mount_types.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_mount_types.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_sources.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_sources.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_sources.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_sources.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_types.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_types.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volume_types.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volume_types.py diff --git a/trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volumes.py b/trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volumes.py similarity index 100% rename from trains/community/influxdb/1.0.17/templates/library/base_v2_1_57/volumes.py rename to trains/community/influxdb/1.1.0/templates/library/base_v2_1_57/volumes.py diff --git a/trains/community/influxdb/1.0.17/templates/test_values/basic-values.yaml b/trains/community/influxdb/1.1.0/templates/test_values/basic-values.yaml similarity index 95% rename from trains/community/influxdb/1.0.17/templates/test_values/basic-values.yaml rename to trains/community/influxdb/1.1.0/templates/test_values/basic-values.yaml index 7e27d08b40..f6dad57cc5 100644 --- a/trains/community/influxdb/1.0.17/templates/test_values/basic-values.yaml +++ b/trains/community/influxdb/1.1.0/templates/test_values/basic-values.yaml @@ -15,6 +15,7 @@ network: web_port: bind_mode: published port_number: 8080 + certificate_id: null ix_volumes: data: /opt/tests/mnt/data diff --git a/trains/community/influxdb/1.1.0/templates/test_values/https-values.yaml b/trains/community/influxdb/1.1.0/templates/test_values/https-values.yaml new file mode 100644 index 0000000000..0882397437 --- /dev/null +++ b/trains/community/influxdb/1.1.0/templates/test_values/https-values.yaml @@ -0,0 +1,121 @@ +resources: + limits: + cpus: 2.0 + memory: 4096 + +influxdb: + additional_envs: [] + +run_as: + user: 568 + group: 568 + +network: + host_network: false + web_port: + bind_mode: published + port_number: 8080 + certificate_id: "1" + +ix_volumes: + data: /opt/tests/mnt/data + config: /opt/tests/mnt/config + +storage: + data: + type: ix_volume + ix_volume_config: + dataset_name: data + create_host_path: true + config: + type: ix_volume + ix_volume_config: + dataset_name: config + create_host_path: true + additional_storage: [] + +ix_certificates: + "1": + certificate: | + -----BEGIN CERTIFICATE----- + MIIEdjCCA16gAwIBAgIDYFMYMA0GCSqGSIb3DQEBCwUAMGwxDDAKBgNVBAMMA2Fz + ZDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxCzAJBgNVBAcMAmFmMQ0wCwYD + VQQKDARhc2RmMQwwCgYDVQQLDANhc2QxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w + HhcNMjEwODMwMjMyMzU0WhcNMjMxMjAzMjMyMzU0WjBuMQswCQYDVQQDDAJhZDEL + MAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxDTALBgNVBAcMBGFzZGYxDTALBgNV + BAoMBGFkc2YxDTALBgNVBAsMBGFzZGYxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w + ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7+1xOHRQyOnQTHFcrdasX + Zl0gzutVlA890a1wiQpdD5dOtCLo7+eqVYjqVKo9W8RUIArXWmBu/AbkH7oVFWC1 + P973W1+ArF5sA70f7BZgqRKJTIisuIFIlRETgfnP2pfQmHRZtGaIJRZI4vQCdYgW + 2g0KOvvNcZJCVq1OrhKiNiY1bWCp66DGg0ic6OEkZFHTm745zUNQaf2dNgsxKU0H + PGjVLJI//yrRFAOSBUqgD4c50krnMF7fU/Fqh+UyOu8t6Y/HsySh3urB+Zie331t + AzV6QV39KKxRflNx/yuWrtIEslGTm+xHKoCYJEk/nZ3mX8Y5hG6wWAb7A/FuDVg3 + AgMBAAGjggEdMIIBGTAnBgNVHREEIDAehwTAqAADhwTAqAAFhwTAqAC2hwTAqACB + hwTAqACSMB0GA1UdDgQWBBQ4G2ff4tgZl4vmo4xCfqmJhdqShzAMBgNVHRMBAf8E + AjAAMIGYBgNVHSMEgZAwgY2AFLlYf9L99nxJDcpCM/LT3V5hQ/a3oXCkbjBsMQww + CgYDVQQDDANhc2QxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARhc2RmMQswCQYDVQQH + DAJhZjENMAsGA1UECgwEYXNkZjEMMAoGA1UECwwDYXNkMRYwFAYJKoZIhvcNAQkB + FgdhQGEuY29tggNgUxcwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwEwDgYDVR0PAQH/ + BAQDAgWgMA0GCSqGSIb3DQEBCwUAA4IBAQA6FpOInEHB5iVk3FP67GybJ29vHZTD + KQHbQgmg8s4L7qIsA1HQ+DMCbdylpA11x+t/eL/n48BvGw2FNXpN6uykhLHJjbKR + h8yITa2KeD3LjLYhScwIigXmTVYSP3km6s8jRL6UKT9zttnIHyXVpBDya6Q4WTMx + fmfC6O7t1PjQ5ZyVtzizIUP8ah9n4TKdXU4A3QIM6WsJXpHb+vqp1WDWJ7mKFtgj + x5TKv3wcPnktx0zMPfLb5BTSE9rc9djcBG0eIAsPT4FgiatCUChe7VhuMnqskxEz + MymJLoq8+mzucRwFkOkR2EIt1x+Irl2mJVMeBow63rVZfUQBD8h++LqB + -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- + MIIEhDCCA2ygAwIBAgIDYFMXMA0GCSqGSIb3DQEBCwUAMGwxDDAKBgNVBAMMA2Fz + ZDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBGFzZGYxCzAJBgNVBAcMAmFmMQ0wCwYD + VQQKDARhc2RmMQwwCgYDVQQLDANhc2QxFjAUBgkqhkiG9w0BCQEWB2FAYS5jb20w + HhcNMjEwODMwMjMyMDQ1WhcNMzEwODI4MjMyMDQ1WjBsMQwwCgYDVQQDDANhc2Qx + CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARhc2RmMQswCQYDVQQHDAJhZjENMAsGA1UE + CgwEYXNkZjEMMAoGA1UECwwDYXNkMRYwFAYJKoZIhvcNAQkBFgdhQGEuY29tMIIB + IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq//c0hEEr83CS1pMgsHX50jt + 2MqIbcf63UUNJTiYpUUvUQSFJFc7m/dr+RTZvu97eDCnD5K2qkHHvTPaPZwY+Djf + iy7N641Sz6u/y3Yo3xxs1Aermsfedh48vusJpjbkT2XS44VjbkrpKcWDNVpp3Evd + M7oJotXeUsZ+imiyVCfr4YhoY5gbGh/r+KN9Wf9YKoUyfLLZGwdZkhtX2zIbidsL + Thqi9YTaUHttGinjiBBum234u/CfvKXsfG3yP2gvBGnlvZnM9ktv+lVffYNqlf7H + VmB1bKKk84HtzuW5X76SGAgOG8eHX4x5ZLI1WQUuoQOVRl1I0UCjBtbz8XhwvQID + AQABo4IBLTCCASkwLQYDVR0RBCYwJIcEwKgABYcEwKgAA4cEwKgAkocEwKgAtYcE + wKgAgYcEwKgAtjAdBgNVHQ4EFgQUuVh/0v32fEkNykIz8tPdXmFD9rcwDwYDVR0T + AQH/BAUwAwEB/zCBmAYDVR0jBIGQMIGNgBS5WH/S/fZ8SQ3KQjPy091eYUP2t6Fw + pG4wbDEMMAoGA1UEAwwDYXNkMQswCQYDVQQGEwJVUzENMAsGA1UECAwEYXNkZjEL + MAkGA1UEBwwCYWYxDTALBgNVBAoMBGFzZGYxDDAKBgNVBAsMA2FzZDEWMBQGCSqG + SIb3DQEJARYHYUBhLmNvbYIDYFMXMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF + BQcDAjAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKEocOmVuWlr + zegtKYMe8NhHIkFY9oVn5ym6RHNOJpPH4QF8XYC3Z5+iC5yGh4P/jVe/4I4SF6Ql + PtofU0jNq5vzapt/y+m008eXqPQFmoUOvu+JavoRVcRx2LIP5AgBA1mF56CSREsX + TkuJAA9IUQ8EjnmAoAeKINuPaKxGDuU8BGCMqr/qd564MKNf9XYL+Fb2rlkA0O2d + 2No34DQLgqSmST/LAvPM7Cbp6knYgnKmGr1nETCXasg1cueHLnWWTvps2HiPp2D/ + +Fq0uqcZLu4Mdo0CPs4e5sHRyldEnRSKh0DVLprq9zr/GMipmPLJUsT5Jed3sj0w + M7Y3vwxshpo= + -----END CERTIFICATE----- + privatekey: | + -----BEGIN PRIVATE KEY----- + MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC7+1xOHRQyOnQT + HFcrdasXZl0gzutVlA890a1wiQpdD5dOtCLo7+eqVYjqVKo9W8RUIArXWmBu/Abk + H7oVFWC1P973W1+ArF5sA70f7BZgqRKJTIisuIFIlRETgfnP2pfQmHRZtGaIJRZI + 4vQCdYgW2g0KOvvNcZJCVq1OrhKiNiY1bWCp66DGg0ic6OEkZFHTm745zUNQaf2d + NgsxKU0HPGjVLJI//yrRFAOSBUqgD4c50krnMF7fU/Fqh+UyOu8t6Y/HsySh3urB + +Zie331tAzV6QV39KKxRflNx/yuWrtIEslGTm+xHKoCYJEk/nZ3mX8Y5hG6wWAb7 + A/FuDVg3AgMBAAECggEAapt30rj9DitGTtxAt13pJMEhyYxvvD3WkvmJwguF/Bbu + eW0Ba1c668fMeRCA54FWi1sMqusPS4HUqqUvk+tmyAOsAF4qgD/A4MMSC7uJSVI5 + N/JWhJWyhCY94/FPakiO1nbPbVw41bcqtzU2qvparpME2CtxSCbDiqm7aaag3Kqe + EF0fGSUdZ+TYl9JM05+eIyiX+UY19Fg0OjTHMn8nGpxcNTfDBdQ68TKvdo/dtIKL + PLKzJUNNdM8odC4CvQtfGMqaslwZwXkiOl5VJcW21ncj/Y0ngEMKeD/i65ZoqGdR + 0FKCQYEAGtM2FvJcZQ92Wsw7yj2bK2MSegVUyLK32QKBgQDe8syVCepPzRsfjfxA + 6TZlWcGuTZLhwIx97Ktw3VcQ1f4rLoEYlv0xC2VWBORpzIsJo4I/OLmgp8a+Ga8z + FkVRnq90dV3t4NP9uJlHgcODHnOardC2UUka4olBSCG6zmK4Jxi34lOxhGRkshOo + L4IBeOIB5g+ZrEEXkzfYJHESRQKBgQDX2YhFhGIrT8BAnC5BbXbhm8h6Bhjz8DYL + d+qhVJjef7L/aJxViU0hX9Ba2O8CLK3FZeREFE3hJPiJ4TZSlN4evxs5p+bbNDcA + 0mhRI/o3X4ac6IxdRebyYnCOB/Cu94/MzppcZcotlCekKNike7eorCcX4Qavm7Pu + MUuQ+ifmSwKBgEnchoqZzlbBzMqXb4rRuIO7SL9GU/MWp3TQg7vQmJerTZlgvsQ2 + wYsOC3SECmhCq4117iCj2luvOdihCboTFsQDnn0mpQe6BIF6Ns3J38wAuqv0CcFd + DKsrge1uyD3rQilgSoAhKzkUc24o0PpXQurZ8YZPgbuXpbj5vPaOnCdBAoGACYc7 + wb3XS4wos3FxhUfcwJbM4b4VKeeHqzfu7pI6cU/3ydiHVitKcVe2bdw3qMPqI9Wc + nvi6e17Tbdq4OCsEJx1OiVwFD9YdO3cOTc6lw/3+hjypvZBRYo+/4jUthbu96E+S + dtOzehGZMmDvN0uSzupSi3ZOgkAAUFpyuIKickMCgYAId0PCRjonO2thn/R0rZ7P + //L852uyzYhXKw5/fjFGhQ6LbaLgIRFaCZ0L2809u0HFnNvJjHv4AKP6j+vFQYYY + qQ+66XnfsA9G/bu4MDS9AX83iahD9IdLXQAy8I19prAbpVumKegPbMnNYNB/TYEc + 3G15AKCXo7jjOUtHY01DCQ== + -----END PRIVATE KEY-----