From 539e345a9ed4942d5791222676c499a6a3c9bf9a Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 10:47:41 +0100 Subject: [PATCH 01/10] fix validation bug and enhance documentation --- README.md | 18 +++++++++--------- acre.yaml | 6 +++--- acre.yaml.example | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 00ba13fa..1e2d0082 100644 --- a/README.md +++ b/README.md @@ -132,8 +132,8 @@ landscape: services: <CIDR IP range> iaas: - - name: (( type )) # name of the seed - type: <gcp|aws|azure|openstack> # iaas provider + - name: (( iaas[0].type )) # name of the seed + type: <gcp|aws|azure|openstack|vsphere> # iaas provider region: <major region>-<minor region> # region for initial seed zones: # remove zones block for Azure - <major region>-<minor region>-<zone> # example: europe-west1-b @@ -158,14 +158,14 @@ landscape: ... credentials: - etcd: # optional, default values based on `landscape.iaas` + etcd: # optional for gcp/aws/azure/openstack, default values based on `landscape.iaas` backup: - type: <gcs|s3|abs|swift> # type of blob storage + type: <gcs|s3|abs|swift> # type of blob storage resourceGroup: # Azure resource group you would like to use for your backup region: (( iaas.region )) # region of blob storage (default: same as above) credentials: (( iaas.credentials )) # credentials for the blob storage's IaaS provider (default: same as above) - dns: # optional, default values based on `landscape.iaas` + dns: # optional for gcp/aws/azure/openstack, default values based on `landscape.iaas` type: <google-clouddns|aws-route53|azure-dns|openstack-designate|cloudflare-dns|infoblox-dns> # dns provider credentials: (( iaas.credentials )) # credentials for the dns provider @@ -219,7 +219,7 @@ Finding out CIDR ranges of your cluster is not trivial. For example, GKE only te ```yaml iaas: - name: (( type )) # name of the seed - type: # iaas provider + type: # iaas provider region: - # region for initial seed zones: # remove zones block for Azure - -- # example: europe-west1-b @@ -227,7 +227,7 @@ iaas: - -- # example: europe-west1-d credentials: # provide access to IaaS layer used for creating resources for shoot clusters - name: # see above - type: # see above + type: # see above region: - # region for seed zones: # remove zones block for Azure - -- # example: europe-west1-b @@ -299,7 +299,7 @@ etcd: credentials: (( iaas.credentials )) ``` Configuration of what blob storage to use for the etcd key-value store. If your IaaS provider offers a blob storage you can use the same values for `etc.backup.region` and `etc.backup.credentials` as above for `iaas.region` and `iaas.credentials` correspondingly by using the [(( foo ))](https://github.com/mandelsoft/spiff/blob/master/README.md#-foo-) expression of spiff. -If you remove single values or the whole block, the missing values will be set to defaults derived from `landscape.iaas`. The `resourceGroup` cannot be defaulted and must be specified. Make sure that the specified `resourceGroup` is empty and unused as deleting the cluster using `sow delete all` deletes this `resourceGroup`. +If the type of `landscape.iaas[0]` is one of `gcp`, `aws`, `azure`, or `openstack`, this block can be defaulted - either partly or as a whole - based on values from `landscape.iaas`. The `resourceGroup`, which is necessary for Azure, cannot be defaulted and must be specified. Make sure that the specified `resourceGroup` is empty and unused as deleting the cluster using `sow delete all` deletes this `resourceGroup`. | Field | Type | Description | Example | Iaas Provider Documentation | |:---------------------- |:---------------------- |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:------------------- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | @@ -317,7 +317,7 @@ dns: credentials: ``` Configuration for the Domain Name Service (DNS) provider. If your IaaS provider also offers a DNS service you can use the same values for `dns.credentials` as for `iaas.creds` above by using the [(( foo ))](https://github.com/mandelsoft/spiff/blob/master/README.md#-foo-) expression of spiff. If they belong to another account (or to another IaaS provider) the appropriate credentials (and their type) have to be configured. -Similar to `landscape.etcd`, missing values will be set to defaults based on the values given in `landscape.iaas`. +Similar to `landscape.etcd`, this block - and parts of it - are optional if the type of `landscape.iaas[0]` is one of `gcp`, `aws`, `azure`, or `openstack`. Missing values will be derived from `landscape.iaas`. | Field | Type | Description | Example | IaaS Provider Documentation | |:------------- |:---------------------- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:------------------------ |:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | diff --git a/acre.yaml b/acre.yaml index 350f0d1d..45cbf10a 100644 --- a/acre.yaml +++ b/acre.yaml @@ -223,9 +223,9 @@ landscape: backup: <<: (( merge )) active: true - type: (( .backup_type_mapping[iaas[0].type] )) - region: (( iaas[0].region )) - credentials: (( iaas[0].credentials )) + type: (( active ? .backup_type_mapping[iaas[0].type] :~~ )) + region: (( active ? iaas[0].region :~~ )) + credentials: (( active ? iaas[0].credentials :~~ )) dashboard: (( ~~ )) identity: ingress: diff --git a/acre.yaml.example b/acre.yaml.example index c75b3dc3..cb14d4da 100644 --- a/acre.yaml.example +++ b/acre.yaml.example @@ -10,8 +10,8 @@ landscape: services: iaas: - - name: (( type )) # name of the seed - type: # iaas provider + - name: (( iaas[0].type )) # name of the seed + type: # iaas provider region: - # region for initial seed zones: # remove zones block for Azure - -- # example: europe-west1-b @@ -20,7 +20,7 @@ landscape: credentials: # provide access to IaaS layer used for creating resources for shoot clusters # your credentials here # - name: # see above - # type: # see above + # type: # see above # region: - # region for seed # zones: # remove zones block for Azure # - -- # example: europe-west1-b @@ -38,13 +38,13 @@ landscape: # credentials: # # your credentials here -# etcd: # optional +# etcd: # optional for gcp/aws/azure/openstack # backup: -# type: -# region: (( iaas.region )) +# type: +# region: (( iaas[0].region )) # credentials: (( iaas[0].credentials )) -# dns: # optional +# dns: # optional for gcp/aws/azure/openstack # type: # credentials: (( iaas[0].credentials )) From 8faa9b9cfb9c351c9aca535319fcbff1b73d9a1f Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 10:58:15 +0100 Subject: [PATCH 02/10] upgrade Gardener extension provider-gcp to v1.13.1 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index 0377e477..27c4437d 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -36,7 +36,7 @@ }, "provider-gcp": { "repo": "https://github.com/gardener/gardener-extension-provider-gcp.git", - "version": "v1.12.0" + "version": "v1.13.1" }, "provider-openstack": { "repo": "https://github.com/gardener/gardener-extension-provider-openstack.git", From 9d62828284f64582cbe12e8e4f244cec1c83760b Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 10:58:56 +0100 Subject: [PATCH 03/10] upgrade Gardener extension provider-aws to v1.17.2 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index 27c4437d..2c76867d 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -28,7 +28,7 @@ }, "provider-aws": { "repo": "https://github.com/gardener/gardener-extension-provider-aws.git", - "version": "v1.16.0" + "version": "v1.17.2" }, "provider-azure": { "repo": "https://github.com/gardener/gardener-extension-provider-azure.git", From d0f8fbebee5bf2cebf7aea4339e2d5f72f2ee7d5 Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 11:00:09 +0100 Subject: [PATCH 04/10] upgrade Gardener extension shoot-cert-service to v1.10.1 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index 2c76867d..b2eade01 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -44,7 +44,7 @@ }, "shoot-cert-service": { "repo": "https://github.com/gardener/gardener-extension-shoot-cert-service.git", - "version": "v1.10.0" + "version": "v1.10.1" }, "shoot-dns-service": { "repo": "https://github.com/gardener/gardener-extension-shoot-dns-service.git", From d919960637d4bfa63419a437ff1adcc1dc9b7c0a Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 11:01:10 +0100 Subject: [PATCH 05/10] upgrade Gardener extension provider-vsphere to v0.4.1 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index b2eade01..d5ed4882 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -52,7 +52,7 @@ }, "provider-vsphere": { "repo": "https://github.com/gardener/gardener-extension-provider-vsphere.git", - "version": "v0.2.0" + "version": "v0.4.1" } } }, From c4a3639afbdb6552f410e018f2277396152909ed Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 11:01:44 +0100 Subject: [PATCH 06/10] upgrade Gardener extension provider-azure to v1.14.1 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index d5ed4882..e5aa74fb 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -32,7 +32,7 @@ }, "provider-azure": { "repo": "https://github.com/gardener/gardener-extension-provider-azure.git", - "version": "v1.14.0" + "version": "v1.14.1" }, "provider-gcp": { "repo": "https://github.com/gardener/gardener-extension-provider-gcp.git", From 8355d1c7796381b09f0fd11096f4cbea5ff61a2c Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 11:02:41 +0100 Subject: [PATCH 07/10] upgrade Gardener extension os-suse-chost to v1.9.0 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index e5aa74fb..bd32a59b 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -16,7 +16,7 @@ }, "os-suse-chost": { "repo": "https://github.com/gardener/gardener-extension-os-suse-jeos.git", - "version": "v1.8.0" + "version": "v1.9.0" }, "os-ubuntu": { "repo": "https://github.com/gardener/gardener-extension-os-ubuntu.git", From dce177f3e8b487a56cb3060634c2edc66ee766c5 Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 11:03:12 +0100 Subject: [PATCH 08/10] upgrade Gardener extension networking-calico to v1.14.0 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index bd32a59b..f5cbe737 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -12,7 +12,7 @@ }, "networking-calico": { "repo": "https://github.com/gardener/gardener-extension-networking-calico.git", - "version": "v1.13.0" + "version": "v1.14.0" }, "os-suse-chost": { "repo": "https://github.com/gardener/gardener-extension-os-suse-jeos.git", From 48adca22c5c4984024075da6124b2b3cca8ce205 Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Mon, 30 Nov 2020 11:03:40 +0100 Subject: [PATCH 09/10] upgrade Gardener extension os-ubuntu to v1.9.0 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index f5cbe737..15f59fb8 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -20,7 +20,7 @@ }, "os-ubuntu": { "repo": "https://github.com/gardener/gardener-extension-os-ubuntu.git", - "version": "v1.8.0" + "version": "v1.9.0" }, "os-gardenlinux": { "repo": "https://github.com/gardener/gardener-extension-os-gardenlinux.git", From 1678b2429a653c0faffa7afebeeeaa9d67e3cfa5 Mon Sep 17 00:00:00 2001 From: Johannes Aubart Date: Tue, 1 Dec 2020 12:04:33 +0100 Subject: [PATCH 10/10] upgrade Gardener extension provider-openstack to v1.13.0 --- dependency-versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-versions.yaml b/dependency-versions.yaml index 15f59fb8..9c55d50e 100644 --- a/dependency-versions.yaml +++ b/dependency-versions.yaml @@ -40,7 +40,7 @@ }, "provider-openstack": { "repo": "https://github.com/gardener/gardener-extension-provider-openstack.git", - "version": "v1.12.0" + "version": "v1.13.0" }, "shoot-cert-service": { "repo": "https://github.com/gardener/gardener-extension-shoot-cert-service.git",