Skip to content

Commit

Permalink
Fix epicli apply --full region values (#2497) (#2599)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
sbbroot and seriva authored Sep 30, 2021
1 parent ce97e63 commit 1f9fb7f
Show file tree
Hide file tree
Showing 4 changed files with 154 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-1.3.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
59 changes: 59 additions & 0 deletions core/src/epicli/data/any/defaults/epiphany-cluster.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
93 changes: 93 additions & 0 deletions core/src/epicli/data/azure/defaults/epiphany-cluster.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1f9fb7f

Please sign in to comment.