From 5ede97f7cfb20b47b8e8e5d841f8091d70a5af16 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Fri, 16 Aug 2024 15:39:54 +0200 Subject: [PATCH] Fixed issues in AWS examples --- .../adr/assets/runtime-examples/aws-freemium.yaml | 12 ++++++------ docs/adr/assets/runtime-examples/aws-minimal.yaml | 4 +++- docs/adr/assets/runtime-examples/aws-trial.yaml | 2 ++ docs/adr/assets/runtime-examples/aws.yaml | 15 +++++++-------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/docs/adr/assets/runtime-examples/aws-freemium.yaml b/docs/adr/assets/runtime-examples/aws-freemium.yaml index aa7d8c79..defde4b0 100644 --- a/docs/adr/assets/runtime-examples/aws-freemium.yaml +++ b/docs/adr/assets/runtime-examples/aws-freemium.yaml @@ -43,17 +43,12 @@ spec: workers: - machine: # spec.shoot.workers.machine.type is required - type: m5.xlarge + type: m6i.xlarge # spec.shoot.workers.machine.image is optional, when not provider default will be used # Will be modified by the SRE image: name: gardenlinux version: 1443.9.0 - # spec.shoot.workers.volume is required for the first release - # Probably can be moved into KIM, as it is hardcoded in KEB, and not dependent on plan - volume: - type: gp2 - size: 50Gi # spec.shoot.worker.zones is required zones: - eu-central-1b @@ -69,6 +64,11 @@ spec: # spec.shoot.workers.maxUnavailable is required in the first release. # It can be optional in the future, as it is always set to 0 maxUnavailable: 0 + # spec.shoot.workers.volume is required for the first release + # Probably can be moved into KIM, as it is hardcoded in KEB, and not dependent on plan + volume: + type: gp2 + size: 50Gi # spec.shoot.Networking is required networking: type: calico diff --git a/docs/adr/assets/runtime-examples/aws-minimal.yaml b/docs/adr/assets/runtime-examples/aws-minimal.yaml index 8d1b5959..91915569 100644 --- a/docs/adr/assets/runtime-examples/aws-minimal.yaml +++ b/docs/adr/assets/runtime-examples/aws-minimal.yaml @@ -63,6 +63,8 @@ spec: # spec.shoot.workers.maxUnavailable is required in the first release. # It can be optional in the future, as it is always set to 0 maxUnavailable: 0 + # spec.shoot.workers.volume is required for the first release + # Probably can be moved into KIM, as it is hardcoded in KEB, and not dependent on plan volume: type: gp2 size: 50Gi @@ -80,7 +82,7 @@ spec: security: networking: filter: - # spec.security.networking is required + # spec.security.networking.filter.egress.enabled is required egress: enabled: false # spec.security.administrators is required diff --git a/docs/adr/assets/runtime-examples/aws-trial.yaml b/docs/adr/assets/runtime-examples/aws-trial.yaml index 6092a179..108c53ff 100644 --- a/docs/adr/assets/runtime-examples/aws-trial.yaml +++ b/docs/adr/assets/runtime-examples/aws-trial.yaml @@ -63,6 +63,8 @@ spec: # spec.shoot.workers.maxUnavailable is required in the first release. # It can be optional in the future, as it is always set to 0 maxUnavailable: 0 + # spec.shoot.workers.volume is required for the first release + # Probably can be moved into KIM, as it is hardcoded in KEB, and not dependent on plan volume: type: gp2 size: 50Gi diff --git a/docs/adr/assets/runtime-examples/aws.yaml b/docs/adr/assets/runtime-examples/aws.yaml index 665d9d92..ba459210 100644 --- a/docs/adr/assets/runtime-examples/aws.yaml +++ b/docs/adr/assets/runtime-examples/aws.yaml @@ -23,7 +23,7 @@ spec: # spec.shoot.region is required region: eu-central-1 # spec.shoot.platformRegion is required - platformRegion: "cd-eu11" + platformRegion: "cf-eu11" # spec.shoot.secretBindingName is required secretBindingName: "hyperscaler secret" # spec.shoot.enforceSeedLocation is optional ; it allows to make sure the seed cluster will be located in the same region as the runtime @@ -63,18 +63,12 @@ spec: image: name: gardenlinux version: 1443.9.0 - # spec.shoot.workers.volume is required for the first release - # Probably can be moved into KIM, as it is hardcoded in KEB, and not dependent on plan - volume: - type: gp2 - size: 50Gi + name: "worker-0" # spec.shoot.workers.zones is required zones: - eu-central-1a - eu-central-1b - eu-central-1c - # spec.shoot.workers.name is optional, if not provided default will be used - name: cpu-worker-0 # spec.shoot.workers.minimum is required minimum: 3 # spec.shoot.workers.maximum is required @@ -85,6 +79,11 @@ spec: # spec.shoot.workers.maxUnavailable is required in the first release. # It can be optional in the future, as it is always set to 0 maxUnavailable: 0 + # spec.shoot.workers.volume is required for the first release + # Probably can be moved into KIM, as it is hardcoded in KEB, and not dependent on plan + volume: + type: gp2 + size: 50Gi # spec.shoot.Networking is required networking: type: calico