diff --git a/CHANGELOG-0.4.md b/CHANGELOG-0.4.md index 2a46929ba4..64b915e677 100644 --- a/CHANGELOG-0.4.md +++ b/CHANGELOG-0.4.md @@ -4,8 +4,11 @@ ### Fixed + +- [#612](https://github.com/epiphany-platform/epiphany/issues/612) - 'epicli delete' - cannot delete a partially built infrastructure - [#613](https://github.com/epiphany-platform/epiphany/pull/613) - Hotfixes for Ubuntu offline installation in air-gap mode - [#614](https://github.com/epiphany-platform/epiphany/pull/614) - Fixed RotatingFileHandler permission error (for Docker Toolbox on Windows) +- [#615](https://github.com/epiphany-platform/epiphany/issues/615) - Minor Azure bugs for 0.4.0 release ## [0.4.0] 2019-10-11 diff --git a/core/src/epicli/cli/engine/BuildEngine.py b/core/src/epicli/cli/engine/BuildEngine.py index 33f5992217..60c572da04 100644 --- a/core/src/epicli/cli/engine/BuildEngine.py +++ b/core/src/epicli/cli/engine/BuildEngine.py @@ -93,6 +93,8 @@ def apply(self): self.process_infrastructure_docs() + save_manifest([*self.input_docs, *self.infrastructure_docs], self.cluster_model.specification.name) + if not (self.skip_infrastructure or self.is_provider_any(self.cluster_model)): # Generate terraform templates with TerraformTemplateGenerator(self.cluster_model, self.infrastructure_docs) as template_generator: @@ -124,7 +126,7 @@ def dry_run(self): self.process_configuration_docs() - return [*self.input_docs, *self.configuration_docs] + return [*self.configuration_docs, *self.infrastructure_docs] @staticmethod def is_provider_any(cluster_model): diff --git a/core/src/epicli/cli/engine/InitEngine.py b/core/src/epicli/cli/engine/InitEngine.py index a7a94323c2..091021320b 100644 --- a/core/src/epicli/cli/engine/InitEngine.py +++ b/core/src/epicli/cli/engine/InitEngine.py @@ -38,17 +38,14 @@ def get_full_config(self, config_docs): cluster_config_path = save_manifest(config_docs, self.name, self.name + '.yml') args = type('obj', (object,), {'file': cluster_config_path})() with BuildEngine(args) as build: - config_docs = build.dry_run() - - infra_docs = load_all_documents_from_folder(self.provider, 'defaults/infrastructure') - merged_docs = [*config_docs, *infra_docs] + docs = build.dry_run() # set the provider for all docs - for doc in merged_docs: + for doc in docs: if 'provider' not in doc.keys(): doc['provider'] = self.provider - return merged_docs + return docs diff --git a/core/src/epicli/cli/engine/providers/azure/InfrastructureBuilder.py b/core/src/epicli/cli/engine/providers/azure/InfrastructureBuilder.py index 3afdc4c2bd..e5b703d2fc 100644 --- a/core/src/epicli/cli/engine/providers/azure/InfrastructureBuilder.py +++ b/core/src/epicli/cli/engine/providers/azure/InfrastructureBuilder.py @@ -45,6 +45,10 @@ def run(self): if (len(component_value.subnets) > 1): self.logger.warning(f'On Azure only one subnet per component is supported for now. Taking first and ignoring others.') + # Add message for ignoring availabiltity zones if present. + if 'availability_zone' in component_value.subnets[0]: + self.logger.warning(f'On Azure availability_zones are not supported jet. Ignoring definition.') + subnet_definition = component_value.subnets[0] subnet = select_first(infrastructure, lambda item: item.kind == 'infrastructure/subnet' and item.specification.address_prefix == subnet_definition['address_pool']) diff --git a/core/src/epicli/cli/helpers/naming_helpers.py b/core/src/epicli/cli/helpers/naming_helpers.py index 688afda2df..b0d35d45a2 100644 --- a/core/src/epicli/cli/helpers/naming_helpers.py +++ b/core/src/epicli/cli/helpers/naming_helpers.py @@ -46,11 +46,12 @@ def storage_account_name(prefix, cluster_name, storage_use): sto = storage_use.lower() clu = '' + cn = cluster_name.replace('-', '') length = 24 - (len(pre)+len(sto)) - if len(cluster_name) > length: - clu = cluster_name[:length].lower() + if len(cn) > length: + clu = cn[:length].lower() else: - clu = cluster_name.lower() + clu = cn.lower() return f'{pre}{clu}{sto}' diff --git a/core/src/epicli/cli/version.py b/core/src/epicli/cli/version.py index 698a3f5800..0d4089c181 100644 --- a/core/src/epicli/cli/version.py +++ b/core/src/epicli/cli/version.py @@ -1 +1 @@ -VERSION = '0.4.0' \ No newline at end of file +VERSION = '0.4.1' \ No newline at end of file diff --git a/core/src/epicli/data/any/defaults/configuration/minimal-cluster-config.yml b/core/src/epicli/data/any/defaults/configuration/minimal-cluster-config.yml index dfe7ad50f4..08629fd071 100644 --- a/core/src/epicli/data/any/defaults/configuration/minimal-cluster-config.yml +++ b/core/src/epicli/data/any/defaults/configuration/minimal-cluster-config.yml @@ -1,5 +1,5 @@ kind: epiphany-cluster -version: 0.4.0 +version: 0.4.1 title: "Epiphany cluster Config" provider: any name: "default" diff --git a/core/src/epicli/data/aws/defaults/configuration/minimal-cluster-config.yml b/core/src/epicli/data/aws/defaults/configuration/minimal-cluster-config.yml index 1a06ed15ed..d1d1585c4d 100644 --- a/core/src/epicli/data/aws/defaults/configuration/minimal-cluster-config.yml +++ b/core/src/epicli/data/aws/defaults/configuration/minimal-cluster-config.yml @@ -1,5 +1,5 @@ kind: epiphany-cluster -version: 0.4.0 +version: 0.4.1 title: "Epiphany cluster Config" provider: aws name: "default" diff --git a/core/src/epicli/data/aws/defaults/infrastructure/default-security-group.yml b/core/src/epicli/data/aws/defaults/infrastructure/default-security-group.yml index d9d2e1281e..cf164c4b4c 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/default-security-group.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/default-security-group.yml @@ -1,5 +1,5 @@ kind: infrastructure/default-security-group -version: 0.4.0 +version: 0.4.1 title: "Default Security Group Config" provider: aws name: default-security-group diff --git a/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml b/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml index e9b6189c2d..5a220a03b0 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml @@ -1,5 +1,5 @@ kind: infrastructure/efs-storage -version: 0.4.0 +version: 0.4.1 title: "Elastic File System Config" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/internet-gateway.yml b/core/src/epicli/data/aws/defaults/infrastructure/internet-gateway.yml index f7f07752bc..3030940c73 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/internet-gateway.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/internet-gateway.yml @@ -1,5 +1,5 @@ kind: infrastructure/internet-gateway -version: 0.4.0 +version: 0.4.1 title: "Internet Gateway Config" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/launch-configuration.yml b/core/src/epicli/data/aws/defaults/infrastructure/launch-configuration.yml index 983334c25c..62ade13a08 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/launch-configuration.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/launch-configuration.yml @@ -1,5 +1,5 @@ kind: infrastructure/launch-configuration -version: 0.4.0 +version: 0.4.1 title: "Launch configuration" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/public-key.yml b/core/src/epicli/data/aws/defaults/infrastructure/public-key.yml index ab420ee069..de78a9c448 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/public-key.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/public-key.yml @@ -1,5 +1,5 @@ kind: infrastructure/public-key -version: 0.4.0 +version: 0.4.1 title: "Public Key" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/resource-group.yml b/core/src/epicli/data/aws/defaults/infrastructure/resource-group.yml index 92fa7b24f5..0ea15a4822 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/resource-group.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/resource-group.yml @@ -1,5 +1,5 @@ kind: infrastructure/resource-group -version: 0.4.0 +version: 0.4.1 title: "Resource Group" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/route-table-association.yml b/core/src/epicli/data/aws/defaults/infrastructure/route-table-association.yml index 8595e68034..2e1725fa09 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/route-table-association.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/route-table-association.yml @@ -1,5 +1,5 @@ kind: infrastructure/route-table-association -version: 0.4.0 +version: 0.4.1 title: Route Table Association Config" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/route-table.yml b/core/src/epicli/data/aws/defaults/infrastructure/route-table.yml index 46deb87ccf..4b0dfd55c4 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/route-table.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/route-table.yml @@ -1,5 +1,5 @@ kind: infrastructure/route-table -version: 0.4.0 +version: 0.4.1 title: "Route Table Config" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/security-group-rule.yml b/core/src/epicli/data/aws/defaults/infrastructure/security-group-rule.yml index d37a024ff5..3feadc55aa 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/security-group-rule.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/security-group-rule.yml @@ -1,5 +1,5 @@ kind: infrastructure/security-group-rule -version: 0.4.0 +version: 0.4.1 title: "Default Group Rule" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/security-group.yml b/core/src/epicli/data/aws/defaults/infrastructure/security-group.yml index 71f0f7eabb..a35819c1f3 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/security-group.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/security-group.yml @@ -1,5 +1,5 @@ kind: infrastructure/security-group -version: 0.4.0 +version: 0.4.1 title: "Security Group Config" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/subnet.yml b/core/src/epicli/data/aws/defaults/infrastructure/subnet.yml index cd9dd7e7b7..96f00f48ff 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/subnet.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/subnet.yml @@ -1,5 +1,5 @@ kind: infrastructure/subnet -version: 0.4.0 +version: 0.4.1 title: "Subnet Config" provider: aws name: default diff --git a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml index 66b490d0cf..d48273e568 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml @@ -1,5 +1,5 @@ kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: default @@ -13,7 +13,7 @@ specification: authorized_to_efs: false mount_efs: false tags: - - version: 0.4.0 + - version: 0.4.1 size: t2.micro os_full_name: "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20190212.1" os_type: linux @@ -84,13 +84,13 @@ specification: --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: default-size-t3 specification: tags: - - version: 0.4.0 + - version: 0.4.1 size: t3.micro os_type: linux security: @@ -117,13 +117,13 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: rabbitmq-machine specification: tags: - - version: 0.4.0 + - version: 0.4.1 size: t3.micro os_type: linux security: @@ -190,13 +190,13 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: load-balancer-machine specification: tags: - - version: 0.4.0 + - version: 0.4.1 size: t3.micro os_type: linux security: @@ -243,7 +243,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: kubernetes-master-machine @@ -343,7 +343,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: kubernetes-node-machine @@ -421,7 +421,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: kafka-machine @@ -547,7 +547,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: monitoring-machine @@ -607,7 +607,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: postgresql-machine @@ -681,7 +681,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: aws name: logging-machine diff --git a/core/src/epicli/data/aws/defaults/infrastructure/vpc.yml b/core/src/epicli/data/aws/defaults/infrastructure/vpc.yml index b8ab68df82..20b06f8fc4 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/vpc.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/vpc.yml @@ -1,5 +1,5 @@ kind: infrastructure/vpc -version: 0.4.0 +version: 0.4.1 title: "VPC Config" provider: aws name: default diff --git a/core/src/epicli/data/azure/defaults/configuration/minimal-cluster-config.yml b/core/src/epicli/data/azure/defaults/configuration/minimal-cluster-config.yml index fc09003f52..5e3bc341a7 100644 --- a/core/src/epicli/data/azure/defaults/configuration/minimal-cluster-config.yml +++ b/core/src/epicli/data/azure/defaults/configuration/minimal-cluster-config.yml @@ -1,5 +1,5 @@ kind: epiphany-cluster -version: 0.4.0 +version: 0.4.1 title: "Epiphany cluster Config" provider: azure name: "default" diff --git a/core/src/epicli/data/azure/defaults/infrastructure/network-interface.yml b/core/src/epicli/data/azure/defaults/infrastructure/network-interface.yml index bb9972c982..62b0b5d14b 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/network-interface.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/network-interface.yml @@ -1,5 +1,5 @@ kind: infrastructure/network-interface -version: 0.4.0 +version: 0.4.1 title: "Network Interface Config" provider: azure name: default diff --git a/core/src/epicli/data/azure/defaults/infrastructure/network-security-group.yml b/core/src/epicli/data/azure/defaults/infrastructure/network-security-group.yml index 7093dd1716..4a42da5ebb 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/network-security-group.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/network-security-group.yml @@ -1,5 +1,5 @@ kind: infrastructure/network-security-group -version: 0.4.0 +version: 0.4.1 title: "Security Group Config" provider: azure name: default diff --git a/core/src/epicli/data/azure/defaults/infrastructure/public-ip.yml b/core/src/epicli/data/azure/defaults/infrastructure/public-ip.yml index 476131eff8..5652c03887 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/public-ip.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/public-ip.yml @@ -1,5 +1,5 @@ kind: infrastructure/public-ip -version: 0.4.0 +version: 0.4.1 title: "Public IP Config" provider: azure name: default diff --git a/core/src/epicli/data/azure/defaults/infrastructure/resource-group.yml b/core/src/epicli/data/azure/defaults/infrastructure/resource-group.yml index 30e7e80ef4..1bdcd0878d 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/resource-group.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/resource-group.yml @@ -1,5 +1,5 @@ kind: infrastructure/resource-group -version: 0.4.0 +version: 0.4.1 title: "Resource Group" provider: azure name: default diff --git a/core/src/epicli/data/azure/defaults/infrastructure/storage-share.yml b/core/src/epicli/data/azure/defaults/infrastructure/storage-share.yml index a376f7caed..949d1344ec 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/storage-share.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/storage-share.yml @@ -1,5 +1,5 @@ kind: infrastructure/storage-share -version: 0.4.0 +version: 0.4.1 title: "Azure shared storage" provider: azure name: default diff --git a/core/src/epicli/data/azure/defaults/infrastructure/subnet-network-security-group-association.yml b/core/src/epicli/data/azure/defaults/infrastructure/subnet-network-security-group-association.yml index d949997924..8308e272c1 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/subnet-network-security-group-association.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/subnet-network-security-group-association.yml @@ -1,5 +1,5 @@ kind: infrastructure/subnet-network-security-group-association -version: 0.4.0 +version: 0.4.1 title: "Subnet Network Security Group Association" provider: azure name: default diff --git a/core/src/epicli/data/azure/defaults/infrastructure/subnet.yml b/core/src/epicli/data/azure/defaults/infrastructure/subnet.yml index d6a680316d..a8717516a2 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/subnet.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/subnet.yml @@ -1,5 +1,5 @@ kind: infrastructure/subnet -version: 0.4.0 +version: 0.4.1 title: "Subnet Config" provider: azure name: default diff --git a/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml index dca2fce330..fbc77b362b 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml @@ -1,5 +1,5 @@ kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: default @@ -65,7 +65,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: kubernetes-master-machine @@ -173,7 +173,7 @@ specification: # destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: kubernetes-node-machine @@ -249,7 +249,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: kafka-machine @@ -375,7 +375,7 @@ specification: # destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: rabbitmq-machine @@ -425,7 +425,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: monitoring-machine @@ -485,7 +485,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: postgresql-machine @@ -549,7 +549,7 @@ specification: # destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: logging-machine @@ -619,7 +619,7 @@ specification: destination_address_prefix: "0.0.0.0/0" --- kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: azure name: load-balancer-machine diff --git a/core/src/epicli/data/azure/defaults/infrastructure/vnet.yml b/core/src/epicli/data/azure/defaults/infrastructure/vnet.yml index b524337231..3cbf27b6d2 100644 --- a/core/src/epicli/data/azure/defaults/infrastructure/vnet.yml +++ b/core/src/epicli/data/azure/defaults/infrastructure/vnet.yml @@ -1,5 +1,5 @@ kind: infrastructure/vnet -version: 0.4.0 +version: 0.4.1 title: "VNET Config" provider: azure name: default diff --git a/core/src/epicli/data/common/defaults/configuration/applications.yml b/core/src/epicli/data/common/defaults/configuration/applications.yml index 5ee34f7259..df50688323 100644 --- a/core/src/epicli/data/common/defaults/configuration/applications.yml +++ b/core/src/epicli/data/common/defaults/configuration/applications.yml @@ -1,5 +1,5 @@ kind: configuration/applications -version: 0.4.0 +version: 0.4.1 title: "Kubernetes Applications Config" name: default specification: @@ -8,7 +8,7 @@ specification: # Abstract these configs to seperate default files and add # the ability to add custom application roles. -# - name: rabbitmq +# - name: rabbitmq 2 # image_path: rabbitmq:3.7.10 # #image_pull_secret_name: regcred # optional # service: diff --git a/core/src/epicli/data/common/defaults/configuration/elasticsearch-curator.yml b/core/src/epicli/data/common/defaults/configuration/elasticsearch-curator.yml index c7061d5c80..66dc8f1f63 100644 --- a/core/src/epicli/data/common/defaults/configuration/elasticsearch-curator.yml +++ b/core/src/epicli/data/common/defaults/configuration/elasticsearch-curator.yml @@ -1,5 +1,5 @@ kind: configuration/elasticsearch-curator -version: 0.4.0 +version: 0.4.1 title: "ElasticSearch curator" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/elasticsearch.yml b/core/src/epicli/data/common/defaults/configuration/elasticsearch.yml index 50bfd0fa91..37b3f8d75b 100644 --- a/core/src/epicli/data/common/defaults/configuration/elasticsearch.yml +++ b/core/src/epicli/data/common/defaults/configuration/elasticsearch.yml @@ -1,5 +1,5 @@ kind: configuration/elasticsearch -version: 0.4.0 +version: 0.4.1 title: "ElasticSearch Config" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml b/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml index 2f2d5d720c..137502dac8 100644 --- a/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml +++ b/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml @@ -1,5 +1,5 @@ kind: configuration/feature-mapping -version: 0.4.0 +version: 0.4.1 title: "Feature mapping to roles" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/filebeat.yml b/core/src/epicli/data/common/defaults/configuration/filebeat.yml index ba8712a03b..05d23cd162 100644 --- a/core/src/epicli/data/common/defaults/configuration/filebeat.yml +++ b/core/src/epicli/data/common/defaults/configuration/filebeat.yml @@ -1,5 +1,5 @@ kind: configuration/filebeat -version: 0.4.0 +version: 0.4.1 title: "Filebeat" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/grafana.yml b/core/src/epicli/data/common/defaults/configuration/grafana.yml index ed50556f63..c30c055740 100644 --- a/core/src/epicli/data/common/defaults/configuration/grafana.yml +++ b/core/src/epicli/data/common/defaults/configuration/grafana.yml @@ -1,5 +1,5 @@ kind: configuration/grafana -version: 0.4.0 +version: 0.4.1 title: "Grafana" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/haproxy-exporter.yml b/core/src/epicli/data/common/defaults/configuration/haproxy-exporter.yml index 15b59b5e16..910d4e522a 100644 --- a/core/src/epicli/data/common/defaults/configuration/haproxy-exporter.yml +++ b/core/src/epicli/data/common/defaults/configuration/haproxy-exporter.yml @@ -1,5 +1,5 @@ kind: configuration/haproxy-exporter -version: 0.4.0 +version: 0.4.1 title: "HAProxy exporter" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/haproxy.yml b/core/src/epicli/data/common/defaults/configuration/haproxy.yml index d44a7dd6e4..67571b6b35 100644 --- a/core/src/epicli/data/common/defaults/configuration/haproxy.yml +++ b/core/src/epicli/data/common/defaults/configuration/haproxy.yml @@ -1,5 +1,5 @@ kind: configuration/haproxy -version: 0.4.0 +version: 0.4.1 title: "HAProxy" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/image-registry.yml b/core/src/epicli/data/common/defaults/configuration/image-registry.yml index bb912a77ce..b77d301f3c 100644 --- a/core/src/epicli/data/common/defaults/configuration/image-registry.yml +++ b/core/src/epicli/data/common/defaults/configuration/image-registry.yml @@ -1,5 +1,5 @@ kind: configuration/image-registry -version: 0.4.0 +version: 0.4.1 title: "Epiphany image registry" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/jmx-exporter.yml b/core/src/epicli/data/common/defaults/configuration/jmx-exporter.yml index eb98933ad8..9f05751271 100644 --- a/core/src/epicli/data/common/defaults/configuration/jmx-exporter.yml +++ b/core/src/epicli/data/common/defaults/configuration/jmx-exporter.yml @@ -1,5 +1,5 @@ kind: configuration/jmx-exporter -version: 0.4.0 +version: 0.4.1 title: "JMX exporter" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/kafka-exporter.yml b/core/src/epicli/data/common/defaults/configuration/kafka-exporter.yml index f8463e0976..f9eba15a4c 100644 --- a/core/src/epicli/data/common/defaults/configuration/kafka-exporter.yml +++ b/core/src/epicli/data/common/defaults/configuration/kafka-exporter.yml @@ -1,5 +1,5 @@ kind: configuration/kafka-exporter -version: 0.4.0 +version: 0.4.1 title: "Kafka exporter" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/kafka.yml b/core/src/epicli/data/common/defaults/configuration/kafka.yml index 975cf24019..87d92d6ed3 100644 --- a/core/src/epicli/data/common/defaults/configuration/kafka.yml +++ b/core/src/epicli/data/common/defaults/configuration/kafka.yml @@ -1,5 +1,5 @@ kind: configuration/kafka -version: 0.4.0 +version: 0.4.1 title: "Kafka" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/kibana.yml b/core/src/epicli/data/common/defaults/configuration/kibana.yml index 54c5388061..5dde8842ee 100644 --- a/core/src/epicli/data/common/defaults/configuration/kibana.yml +++ b/core/src/epicli/data/common/defaults/configuration/kibana.yml @@ -1,5 +1,5 @@ kind: configuration/kibana -version: 0.4.0 +version: 0.4.1 title: "Kibana" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml b/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml index 1e2af0e394..a176003827 100644 --- a/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml +++ b/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml @@ -1,5 +1,5 @@ kind: configuration/kubernetes-master -version: 0.4.0 +version: 0.4.1 title: "Kubernetes Master Config" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/kubernetes-node.yml b/core/src/epicli/data/common/defaults/configuration/kubernetes-node.yml index 89226f8ec9..4220120ecb 100644 --- a/core/src/epicli/data/common/defaults/configuration/kubernetes-node.yml +++ b/core/src/epicli/data/common/defaults/configuration/kubernetes-node.yml @@ -1,5 +1,5 @@ kind: configuration/kubernetes-node -version: 0.4.0 +version: 0.4.1 title: "Kubernetes Node Config" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/node-exporter.yml b/core/src/epicli/data/common/defaults/configuration/node-exporter.yml index 1883daed59..e4eb3c66e9 100644 --- a/core/src/epicli/data/common/defaults/configuration/node-exporter.yml +++ b/core/src/epicli/data/common/defaults/configuration/node-exporter.yml @@ -1,5 +1,5 @@ kind: configuration/node-exporter -version: 0.4.0 +version: 0.4.1 title: "Node exporter" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/postgresql.yml b/core/src/epicli/data/common/defaults/configuration/postgresql.yml index c6764ee21f..c63066c5ff 100644 --- a/core/src/epicli/data/common/defaults/configuration/postgresql.yml +++ b/core/src/epicli/data/common/defaults/configuration/postgresql.yml @@ -1,5 +1,5 @@ kind: configuration/postgresql -version: 0.4.0 +version: 0.4.1 title: "Postgresql" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/prometheus.yml b/core/src/epicli/data/common/defaults/configuration/prometheus.yml index 02b5615406..4236eaa5e5 100644 --- a/core/src/epicli/data/common/defaults/configuration/prometheus.yml +++ b/core/src/epicli/data/common/defaults/configuration/prometheus.yml @@ -1,5 +1,5 @@ kind: configuration/prometheus -version: 0.4.0 +version: 0.4.1 title: "Prometheus" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml b/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml index 3ae15ad69a..3990a900c6 100644 --- a/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml +++ b/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml @@ -1,5 +1,5 @@ kind: configuration/rabbitmq -version: 0.4.0 +version: 0.4.1 title: "RabbitMQ" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/repository.yml b/core/src/epicli/data/common/defaults/configuration/repository.yml index 2cbd8b8a91..1607e3baca 100644 --- a/core/src/epicli/data/common/defaults/configuration/repository.yml +++ b/core/src/epicli/data/common/defaults/configuration/repository.yml @@ -1,5 +1,5 @@ kind: configuration/repository -version: 0.4.0 +version: 0.4.1 title: "Epiphany requirements repository" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/shared-config.yml b/core/src/epicli/data/common/defaults/configuration/shared-config.yml index d865fa78df..18ad12bc8e 100644 --- a/core/src/epicli/data/common/defaults/configuration/shared-config.yml +++ b/core/src/epicli/data/common/defaults/configuration/shared-config.yml @@ -1,5 +1,5 @@ kind: configuration/shared-config -version: 0.4.0 +version: 0.4.1 title: "Shared configuration that will be visible to all roles" name: default specification: diff --git a/core/src/epicli/data/common/defaults/configuration/zookeeper.yml b/core/src/epicli/data/common/defaults/configuration/zookeeper.yml index fcf8c3cb98..63135499ac 100644 --- a/core/src/epicli/data/common/defaults/configuration/zookeeper.yml +++ b/core/src/epicli/data/common/defaults/configuration/zookeeper.yml @@ -1,5 +1,5 @@ kind: configuration/zookeeper -version: 0.4.0 +version: 0.4.1 title: "Zookeeper" name: default specification: diff --git a/core/src/epicli/data/common/defaults/epiphany-cluster.yml b/core/src/epicli/data/common/defaults/epiphany-cluster.yml index fb0d4bb217..8334a318b4 100644 --- a/core/src/epicli/data/common/defaults/epiphany-cluster.yml +++ b/core/src/epicli/data/common/defaults/epiphany-cluster.yml @@ -1,81 +1,81 @@ -kind: epiphany-cluster -version: 0.4.0 -title: "Epiphany cluster Config" -provider: aws -name: "default" -specification: - prefix: default - name: epiphanycluster - admin_user: - name: operations # YOUR-ADMIN-USERNAME - key_path: /root/.ssh/epiphany-operations/id_rsa # YOUR-SSH-KEY-PATH - cloud: - subscription_name: YOUR-SUB-NAME - vnet_address_pool: 10.1.0.0/20 - use_public_ips: False # When not using public IPs you have to provide connectivity via private IPs (VPN) - use_service_principal: False - region: eu-west-2 - credentials: # todo change it to get credentials from vault - key: 3124-4124-4124 - secret: DADFAFHCJHCAUYEAk - components: - kubernetes_master: - count: 1 - machine: kubernetes-master-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.1.0/24 - - availability_zone: eu-west-2b - address_pool: 10.1.2.0/24 - kubernetes_node: - count: 2 - machine: kubernetes-node-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.1.0/24 - - availability_zone: eu-west-2b - address_pool: 10.1.2.0/24 - logging: - count: 1 - machine: logging-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.3.0/24 - monitoring: - count: 1 - machine: monitoring-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.4.0/24 - kafka: - count: 2 - machine: kafka-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.5.0/24 - postgresql: - count: 0 - machine: postgresql-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.6.0/24 - load_balancer: - count: 1 - machine: load-balancer-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.7.0/24 - rabbitmq: - count: 0 - machine: rabbitmq-machine - configuration: default - subnets: - - availability_zone: eu-west-2a - address_pool: 10.1.8.0/24 +kind: epiphany-cluster +version: 0.4.1 +title: "Epiphany cluster Config" +provider: aws +name: "default" +specification: + prefix: default + name: epiphanycluster + admin_user: + name: operations # YOUR-ADMIN-USERNAME + key_path: /root/.ssh/epiphany-operations/id_rsa # YOUR-SSH-KEY-PATH + cloud: + subscription_name: YOUR-SUB-NAME + vnet_address_pool: 10.1.0.0/20 + use_public_ips: False # When not using public IPs you have to provide connectivity via private IPs (VPN) + use_service_principal: False + region: eu-west-2 + credentials: # todo change it to get credentials from vault + key: 3124-4124-4124 + secret: DADFAFHCJHCAUYEAk + components: + kubernetes_master: + count: 1 + machine: kubernetes-master-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.1.0/24 + - availability_zone: eu-west-2b + address_pool: 10.1.2.0/24 + kubernetes_node: + count: 2 + machine: kubernetes-node-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.1.0/24 + - availability_zone: eu-west-2b + address_pool: 10.1.2.0/24 + logging: + count: 1 + machine: logging-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.3.0/24 + monitoring: + count: 1 + machine: monitoring-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.4.0/24 + kafka: + count: 2 + machine: kafka-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.5.0/24 + postgresql: + count: 0 + machine: postgresql-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.6.0/24 + load_balancer: + count: 1 + machine: load-balancer-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.7.0/24 + rabbitmq: + count: 0 + machine: rabbitmq-machine + configuration: default + subnets: + - availability_zone: eu-west-2a + address_pool: 10.1.8.0/24 diff --git a/core/src/epicli/data/common/defaults/infrastructure/machine.yml b/core/src/epicli/data/common/defaults/infrastructure/machine.yml index bcc968ef14..0e5614074d 100644 --- a/core/src/epicli/data/common/defaults/infrastructure/machine.yml +++ b/core/src/epicli/data/common/defaults/infrastructure/machine.yml @@ -1,5 +1,5 @@ kind: infrastructure/virtual-machine -version: 0.4.0 +version: 0.4.1 title: "Virtual Machine Infra" provider: any name: default diff --git a/core/src/epicli/data/common/validation/core/definitions.yml b/core/src/epicli/data/common/validation/core/definitions.yml index 08bc0ed4fd..8b0716f7fb 100644 --- a/core/src/epicli/data/common/validation/core/definitions.yml +++ b/core/src/epicli/data/common/validation/core/definitions.yml @@ -24,9 +24,9 @@ provider: version: type: string title: The Version Schema - default: '0.4.0' + default: '0.4.1' examples: - - 0.4.0 + - 0.4.1 pattern: ^((\d+\.)(\d+\.)(\d))$ unvalidated_specification: type: diff --git a/core/src/epicli/data/common/validation/epiphany-cluster.yml b/core/src/epicli/data/common/validation/epiphany-cluster.yml index 25537a58d5..6f1e6b649a 100644 --- a/core/src/epicli/data/common/validation/epiphany-cluster.yml +++ b/core/src/epicli/data/common/validation/epiphany-cluster.yml @@ -1,43 +1,43 @@ -"$id": "#/epiphany-cluster/specification" -title: "Cluster specification schema" -description: "The main cluster specification" -type: object -required: - - name - - admin_user - - components -properties: - prefix: - "$id": "#/epiphany-cluster/properties/prefix" - title: "Cluster prefix" - description: "A prefix the can be prepended to the cluster name" - examples: - - prod01 - - dev02 - - test03 - - cust04 - type: string - pattern: "^[a-z0-9]{2,8}$" - name: - "$id": "#/epiphany-cluster/properties/name" - title: "Cluster name" - description: "The name of the cluster" - examples: - - clustername01 - type: string - pattern: "^[a-z0-9]{3,20}$" - admin_user: - "$id": "#/epiphany-cluster/properties/admin_user" - title: "The admin_user Schema" - description: "Settings needed for the SSH connection to the cluster machines or VM's" - type: object - cloud: - "$id": "#/epiphany-cluster/properties/cloud" - title: "Cloud Schema" - description: "Settings specific to cloud providers (AWS, Azure)" - type: object - components: - "$id": "#/epiphany-cluster/properties/components" - title: "Components schema" - description: "Cluster component layout specification" +"$id": "#/epiphany-cluster/specification" +title: "Cluster specification schema" +description: "The main cluster specification" +type: object +required: + - name + - admin_user + - components +properties: + prefix: + "$id": "#/epiphany-cluster/properties/prefix" + title: "Cluster prefix" + description: "A prefix the can be prepended to the cluster name" + examples: + - prod01 + - dev02 + - test03 + - cust04 + type: string + pattern: "^[a-z0-9]{2,8}$" + name: + "$id": "#/epiphany-cluster/properties/name" + title: "Cluster name" + description: "The name of the cluster" + examples: + - clustername01 + type: string + pattern: "^[a-z0-9\\-]{3,20}$" + admin_user: + "$id": "#/epiphany-cluster/properties/admin_user" + title: "The admin_user Schema" + description: "Settings needed for the SSH connection to the cluster machines or VM's" + type: object + cloud: + "$id": "#/epiphany-cluster/properties/cloud" + title: "Cloud Schema" + description: "Settings specific to cloud providers (AWS, Azure)" + type: object + components: + "$id": "#/epiphany-cluster/properties/components" + title: "Components schema" + description: "Cluster component layout specification" type: object \ No newline at end of file