From 1f9fb7fe1d77a60f4e78d66a383a9616d4a1f5e7 Mon Sep 17 00:00:00 2001 From: sbbroot <86356638+sbbroot@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:53:50 +0200 Subject: [PATCH] Fix epicli apply --full region values (#2497) (#2599) * Fix epicli apply --full region values (#2497) * Add separate epiphany-cluster.yml for Azure * Move epiphany-cluster.yml from common to aws * add CHANGELOG * * add `any` default cluster configuration * remove second subnets from the default azure configuration * remove availability_zone from the default azure configuration * * remove `cloud` from the default `any` configuration * remove `use_service_principal` from the default aws configuration * remove `credentials` from the default Azure configuration * * remove `subscription_name` from the default aws configuration Co-authored-by: Luuk van Venrooij <11056665+seriva@users.noreply.github.com> --- CHANGELOG-1.3.md | 1 + .../data/any/defaults/epiphany-cluster.yml | 59 ++++++++++++ .../defaults/epiphany-cluster.yml | 4 +- .../data/azure/defaults/epiphany-cluster.yml | 93 +++++++++++++++++++ 4 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 core/src/epicli/data/any/defaults/epiphany-cluster.yml rename core/src/epicli/data/{common => aws}/defaults/epiphany-cluster.yml (96%) create mode 100644 core/src/epicli/data/azure/defaults/epiphany-cluster.yml diff --git a/CHANGELOG-1.3.md b/CHANGELOG-1.3.md index e9b40699f4..dea38274ee 100644 --- a/CHANGELOG-1.3.md +++ b/CHANGELOG-1.3.md @@ -9,6 +9,7 @@ ### Fixed +- [#2497](https://github.com/epiphany-platform/epiphany/issues/2497) - Fix epicli apply --full region values - [#1743](https://github.com/epiphany-platform/epiphany/issues/1743) - Virtual machine "kind" mismatch ### Updated diff --git a/core/src/epicli/data/any/defaults/epiphany-cluster.yml b/core/src/epicli/data/any/defaults/epiphany-cluster.yml new file mode 100644 index 0000000000..84d07d98b6 --- /dev/null +++ b/core/src/epicli/data/any/defaults/epiphany-cluster.yml @@ -0,0 +1,59 @@ +kind: epiphany-cluster +title: "Epiphany cluster Config" +provider: any +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 + components: + kubernetes_master: + count: 1 + machine: kubernetes-master-machine + configuration: default + kubernetes_node: + count: 2 + machine: kubernetes-node-machine + configuration: default + logging: + count: 1 + machine: logging-machine + configuration: default + monitoring: + count: 1 + machine: monitoring-machine + configuration: default + kafka: + count: 2 + machine: kafka-machine + configuration: default + postgresql: + count: 0 + machine: postgresql-machine + configuration: default + load_balancer: + count: 1 + machine: load-balancer-machine + configuration: default + rabbitmq: + count: 0 + machine: rabbitmq-machine + configuration: default + ignite: + count: 0 + machine: ignite-machine + configuration: default + opendistro_for_elasticsearch: + count: 0 + machine: logging-machine + configuration: default + repository: + count: 1 + machine: repository-machine + configuration: default + single_machine: + count: 0 + machine: single-machine + configuration: default diff --git a/core/src/epicli/data/common/defaults/epiphany-cluster.yml b/core/src/epicli/data/aws/defaults/epiphany-cluster.yml similarity index 96% rename from core/src/epicli/data/common/defaults/epiphany-cluster.yml rename to core/src/epicli/data/aws/defaults/epiphany-cluster.yml index 2f7ba91bd4..a308f2cc8b 100644 --- a/core/src/epicli/data/common/defaults/epiphany-cluster.yml +++ b/core/src/epicli/data/aws/defaults/epiphany-cluster.yml @@ -10,10 +10,8 @@ specification: key_path: /root/.ssh/epiphany-operations/id_rsa # YOUR-SSH-KEY-PATH cloud: k8s_as_cloud_service: False - 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 @@ -111,4 +109,4 @@ specification: - availability_zone: eu-west-2a address_pool: 10.1.1.0/24 - availability_zone: eu-west-2b - address_pool: 10.1.2.0/24 + address_pool: 10.1.2.0/24 diff --git a/core/src/epicli/data/azure/defaults/epiphany-cluster.yml b/core/src/epicli/data/azure/defaults/epiphany-cluster.yml new file mode 100644 index 0000000000..8028ddd1dc --- /dev/null +++ b/core/src/epicli/data/azure/defaults/epiphany-cluster.yml @@ -0,0 +1,93 @@ +kind: epiphany-cluster +title: "Epiphany cluster Config" +provider: azure +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: + k8s_as_cloud_service: False + 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: West Europe + network: + use_network_security_groups: True + default_os_image: default + components: + kubernetes_master: + count: 1 + machine: kubernetes-master-machine + configuration: default + subnets: + - address_pool: 10.1.1.0/24 + kubernetes_node: + count: 2 + machine: kubernetes-node-machine + configuration: default + subnets: + - address_pool: 10.1.1.0/24 + logging: + count: 1 + machine: logging-machine + configuration: default + subnets: + - address_pool: 10.1.3.0/24 + monitoring: + count: 1 + machine: monitoring-machine + configuration: default + subnets: + - address_pool: 10.1.4.0/24 + kafka: + count: 2 + machine: kafka-machine + configuration: default + subnets: + - address_pool: 10.1.5.0/24 + postgresql: + count: 0 + machine: postgresql-machine + configuration: default + subnets: + - address_pool: 10.1.6.0/24 + load_balancer: + count: 1 + machine: load-balancer-machine + configuration: default + subnets: + - address_pool: 10.1.7.0/24 + rabbitmq: + count: 0 + machine: rabbitmq-machine + configuration: default + subnets: + - address_pool: 10.1.8.0/24 + ignite: + count: 0 + machine: ignite-machine + configuration: default + subnets: + - address_pool: 10.1.9.0/24 + opendistro_for_elasticsearch: + count: 0 + machine: logging-machine + configuration: default + subnets: + - address_pool: 10.1.10.0/24 + repository: + count: 1 + machine: repository-machine + configuration: default + subnets: + - address_pool: 10.1.11.0/24 + single_machine: + count: 0 + machine: single-machine + configuration: default + subnets: + - address_pool: 10.1.1.0/24