Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update extensions #340

Merged
merged 10 commits into from
Dec 1, 2020
Merged

Update extensions #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
539e345
fix validation bug and enhance documentation
Diaphteiros Nov 30, 2020
8faa9b9
upgrade Gardener extension provider-gcp to v1.13.1
Diaphteiros Nov 30, 2020
9d62828
upgrade Gardener extension provider-aws to v1.17.2
Diaphteiros Nov 30, 2020
d0f8fbe
upgrade Gardener extension shoot-cert-service to v1.10.1
Diaphteiros Nov 30, 2020
d919960
upgrade Gardener extension provider-vsphere to v0.4.1
Diaphteiros Nov 30, 2020
c4a3639
upgrade Gardener extension provider-azure to v1.14.1
Diaphteiros Nov 30, 2020
8355d1c
upgrade Gardener extension os-suse-chost to v1.9.0
Diaphteiros Nov 30, 2020
dce177f
upgrade Gardener extension networking-calico to v1.14.0
Diaphteiros Nov 30, 2020
48adca2
upgrade Gardener extension os-ubuntu to v1.9.0
Diaphteiros Nov 30, 2020
1678b24
upgrade Gardener extension provider-openstack to v1.13.0
Diaphteiros Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ landscape:
services: <CIDR IP range>

<a href="#landscapeiaas">iaas</a>:
- name: (( type )) # name of the seed
type: &lt;gcp|aws|azure|openstack&gt; # iaas provider
- name: (( iaas[0].type )) # name of the seed
type: &lt;gcp|aws|azure|openstack|vsphere&gt; # iaas provider
region: &lt;major region&gt;-&lt;minor region&gt; # region for initial seed
zones: # remove zones block for Azure
- &lt;major region&gt;-&lt;minor region&gt;-&lt;zone&gt; # example: europe-west1-b
Expand All @@ -158,14 +158,14 @@ landscape:
...
credentials:

<a href="#landscapeetcd">etcd</a>: # optional, default values based on `landscape.iaas`
<a href="#landscapeetcd">etcd</a>: # optional for gcp/aws/azure/openstack, default values based on `landscape.iaas`
backup:
type: &lt;gcs|s3|abs|swift&gt; # type of blob storage
type: &lt;gcs|s3|abs|swift&gt; # 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)

<a href="#landscapedns">dns</a>: # optional, default values based on `landscape.iaas`
<a href="#landscapedns">dns</a>: # optional for gcp/aws/azure/openstack, default values based on `landscape.iaas`
type: &lt;google-clouddns|aws-route53|azure-dns|openstack-designate|cloudflare-dns|infoblox-dns&gt; # dns provider
credentials: (( iaas.credentials )) # credentials for the dns provider

Expand Down Expand Up @@ -219,15 +219,15 @@ Finding out CIDR ranges of your cluster is not trivial. For example, GKE only te
```yaml
iaas:
- name: (( type )) # name of the seed
type: <gcp|aws|azure|openstack> # iaas provider
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
- <major region>-<minor region>-<zone> # example: europe-west1-c
- <major region>-<minor region>-<zone> # example: europe-west1-d
credentials: # provide access to IaaS layer used for creating resources for shoot clusters
- name: # see above
type: <gcp|aws|azure|openstack> # see above
type: <gcp|aws|azure|openstack|vsphere> # see above
region: <major region>-<minor region> # region for seed
zones: # remove zones block for Azure
- <major region>-<minor region>-<zone> # example: europe-west1-b
Expand Down Expand Up @@ -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 |
|:---------------------- |:---------------------- |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:------------------- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
Expand All @@ -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 |
|:------------- |:---------------------- |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |:------------------------ |:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
Expand Down
6 changes: 3 additions & 3 deletions acre.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions acre.yaml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ landscape:
services: <service CIDR>

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
Expand All @@ -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: <gcp|aws|azure|openstack> # see above
# type: <gcp|aws|azure|openstack|vsphere> # see above
# region: <major region>-<minor region> # region for seed
# zones: # remove zones block for Azure
# - <major region>-<minor region>-<zone> # example: europe-west1-b
Expand All @@ -38,13 +38,13 @@ landscape:
# credentials:
# # your credentials here

# etcd: # optional
# etcd: # optional for gcp/aws/azure/openstack
# backup:
# type: <gcs/s3/abs>
# region: (( iaas.region ))
# type: <gcs|s3|abs|swift>
# region: (( iaas[0].region ))
# credentials: (( iaas[0].credentials ))

# dns: # optional
# dns: # optional for gcp/aws/azure/openstack
# type: <google-clouddns/aws-route53/azure-dns/openstack-designate/cloudflare-dns/infoblox-dns>
# credentials: (( iaas[0].credentials ))

Expand Down
18 changes: 9 additions & 9 deletions dependency-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,47 +12,47 @@
},
"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",
"version": "v1.8.0"
"version": "v1.9.0"
},
"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",
"version": "v0.7.0"
},
"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",
"version": "v1.14.0"
"version": "v1.14.1"
},
"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",
"version": "v1.12.0"
"version": "v1.13.0"
},
"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",
"version": "v1.9.0"
},
"provider-vsphere": {
"repo": "https://github.com/gardener/gardener-extension-provider-vsphere.git",
"version": "v0.2.0"
"version": "v0.4.1"
}
}
},
Expand Down