From e4f5f53c3db31c8aa5b639bef6c02c33e4731673 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Fri, 16 Aug 2024 10:32:21 +0200 Subject: [PATCH 1/7] Improved error description in status --- internal/controller/runtime/fsm/runtime_fsm_create_shoot.go | 3 ++- .../controller/runtime/fsm/runtime_fsm_delete_kubeconfig.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/controller/runtime/fsm/runtime_fsm_create_shoot.go b/internal/controller/runtime/fsm/runtime_fsm_create_shoot.go index 7f6ea9b6..9269c07c 100644 --- a/internal/controller/runtime/fsm/runtime_fsm_create_shoot.go +++ b/internal/controller/runtime/fsm/runtime_fsm_create_shoot.go @@ -2,6 +2,7 @@ package fsm import ( "context" + "fmt" imv1 "github.com/kyma-project/infrastructure-manager/api/v1" ctrl "sigs.k8s.io/controller-runtime" @@ -29,7 +30,7 @@ func sFnCreateShoot(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl imv1.ConditionTypeRuntimeProvisioned, imv1.ConditionReasonGardenerError, "False", - "Gardener API create error", + fmt.Sprintf("Gardener API create error: %v", err), ) return updateStatusAndRequeueAfter(gardenerRequeueDuration) } diff --git a/internal/controller/runtime/fsm/runtime_fsm_delete_kubeconfig.go b/internal/controller/runtime/fsm/runtime_fsm_delete_kubeconfig.go index 91bd763a..5208322e 100644 --- a/internal/controller/runtime/fsm/runtime_fsm_delete_kubeconfig.go +++ b/internal/controller/runtime/fsm/runtime_fsm_delete_kubeconfig.go @@ -2,6 +2,7 @@ package fsm import ( "context" + "fmt" imv1 "github.com/kyma-project/infrastructure-manager/api/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -51,7 +52,7 @@ func sFnDeleteKubeconfig(ctx context.Context, m *fsm, s *systemState) (stateFn, imv1.ConditionTypeRuntimeDeprovisioned, imv1.ConditionReasonGardenerError, "False", - "Gardener API shoot delete error", + fmt.Sprintf("Gardener API delete error: %v", err), ) } else { s.instance.UpdateStateDeletion( From 0231028cc518e38329773f9d0c0d0cc6f235f721 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Fri, 16 Aug 2024 13:17:10 +0200 Subject: [PATCH 2/7] Fixed issues in AWS examples --- .../assets/runtime-examples/aws-freemium.yaml | 12 ++++++----- .../assets/runtime-examples/aws-minimal.yaml | 21 +++++++++++++------ .../assets/runtime-examples/aws-trial.yaml | 19 ++++++++++++----- docs/adr/assets/runtime-examples/aws.yaml | 14 +++++++------ 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/docs/adr/assets/runtime-examples/aws-freemium.yaml b/docs/adr/assets/runtime-examples/aws-freemium.yaml index 86733d7e..aa7d8c79 100644 --- a/docs/adr/assets/runtime-examples/aws-freemium.yaml +++ b/docs/adr/assets/runtime-examples/aws-freemium.yaml @@ -1,22 +1,23 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: aws-fremium kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: aws-fremium namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: aws-fremium # spec.shoot.purpose is required purpose: evaluation # spec.shoot.region is required @@ -47,7 +48,7 @@ spec: # Will be modified by the SRE image: name: gardenlinux - version: 1312.3.0 + 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: @@ -70,6 +71,7 @@ spec: maxUnavailable: 0 # spec.shoot.Networking is required networking: + type: calico pods: 100.64.0.0/12 nodes: 10.250.0.0/16 services: 100.104.0.0/13 diff --git a/docs/adr/assets/runtime-examples/aws-minimal.yaml b/docs/adr/assets/runtime-examples/aws-minimal.yaml index 10e4958c..8d1b5959 100644 --- a/docs/adr/assets/runtime-examples/aws-minimal.yaml +++ b/docs/adr/assets/runtime-examples/aws-minimal.yaml @@ -1,22 +1,23 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: aws-minimal kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: aws-minimal namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: aws-minimal # spec.shoot.purpose is required purpose: production # spec.shoot.region is required @@ -41,8 +42,12 @@ spec: # spec.shoot.provider.workers is required workers: - machine: - # spec.shoot.workers.machine.type is required - type: m6i.large + # spec.shoot.workers.machine.type is required + type: m6i.large + image: + name: gardenlinux + version: 1443.9.0 + name: "worker-0" # spec.shoot.workers.zones is required zones: - eu-central-1a @@ -58,8 +63,12 @@ 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 + volume: + type: gp2 + size: 50Gi # spec.shoot.Networking is required networking: + type: calico pods: 100.64.0.0/12 nodes: 10.250.0.0/16 services: 100.104.0.0/13 diff --git a/docs/adr/assets/runtime-examples/aws-trial.yaml b/docs/adr/assets/runtime-examples/aws-trial.yaml index 15df3583..6092a179 100644 --- a/docs/adr/assets/runtime-examples/aws-trial.yaml +++ b/docs/adr/assets/runtime-examples/aws-trial.yaml @@ -1,22 +1,23 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: aws-trial kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: aws-trial namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: aws-trial # spec.shoot.purpose is required purpose: evaluation # spec.shoot.licenceType is optional, default=nil @@ -44,7 +45,11 @@ spec: workers: - machine: # spec.shoot.workers.machine.type is required - type: mx5.large + type: m6i.large + image: + name: gardenlinux + version: 1443.9.0 + name: "worker-0" # spec.shoot.workers.zones is required zones: - eu-central-1b @@ -58,8 +63,12 @@ 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 + volume: + type: gp2 + size: 50Gi # spec.shoot.Networking is required networking: + type: calico pods: 10.96.0.0/13 nodes: 10.250.0.0/22 services: 10.104.0.0/13 diff --git a/docs/adr/assets/runtime-examples/aws.yaml b/docs/adr/assets/runtime-examples/aws.yaml index 9761e722..665d9d92 100644 --- a/docs/adr/assets/runtime-examples/aws.yaml +++ b/docs/adr/assets/runtime-examples/aws.yaml @@ -1,22 +1,23 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: aws-full kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: aws-full namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: aws-full # spec.shoot.purpose is required purpose: production # spec.shoot.region is required @@ -26,7 +27,7 @@ spec: # 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 - enforceSeedLocation: "true" + enforceSeedLocation: true kubernetes: # spec.shoot.kubernetes.version is optional, when not provided default will be used # Will be modified by the SRE @@ -61,7 +62,7 @@ spec: # Will be modified by the SRE image: name: gardenlinux - version: 1312.3.0 + 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: @@ -86,6 +87,7 @@ spec: maxUnavailable: 0 # spec.shoot.Networking is required networking: + type: calico pods: 100.64.0.0/12 nodes: 10.250.0.0/16 services: 100.104.0.0/13 From 5ede97f7cfb20b47b8e8e5d841f8091d70a5af16 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Fri, 16 Aug 2024 15:39:54 +0200 Subject: [PATCH 3/7] 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 From 5768ddeb372aef5194b4cd5ee5a5f1c54e6baf18 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Fri, 16 Aug 2024 17:41:19 +0200 Subject: [PATCH 4/7] Fixed issues in Azure examples --- .../runtime-examples/azure-fremium.yaml | 29 ++++++++++++++----- .../assets/runtime-examples/azure-lite.yaml | 14 +++++---- docs/adr/assets/runtime-examples/azure.yaml | 23 ++++++++------- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/docs/adr/assets/runtime-examples/azure-fremium.yaml b/docs/adr/assets/runtime-examples/azure-fremium.yaml index ab725d2d..eb2ccc7b 100644 --- a/docs/adr/assets/runtime-examples/azure-fremium.yaml +++ b/docs/adr/assets/runtime-examples/azure-fremium.yaml @@ -1,26 +1,27 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: azure-fremium kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: azure-fremium namespace: kcp-system spec: shoot: # spec.shoot.name is set required - name: shoot-name + name: azure-fremium # spec.shoot.purpose is required purpose: evaluation # spec.shoot.region is required - region: eu-central-1 + region: polandcentral # spec.shoot.platformRegion is required platformRegion: "cf-us10" # spec.shoot.secretBindingName is required @@ -41,11 +42,22 @@ spec: # spec.shoot.provider.workers is required workers: - machine: - # spec.shoot.workers.machine.type is required - type: mx5.large + # spec.shoot.workers.machine.type is required + type: Standard_D2s_v5 + # 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 + name: "worker-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: Standard_LRS + size: 50Gi # spec.shoot.worker.zones is required zones: - - 1 + - "1" # spec.shoot.workers.minimum is required minimum: 1 # spec.shoot.workers.maximum is required @@ -58,6 +70,7 @@ spec: maxUnavailable: 0 # spec.shoot.Networking is required networking: + type: calico pods: 10.96.0.0/13 nodes: 10.250.0.0/22 services: 10.104.0.0/13 diff --git a/docs/adr/assets/runtime-examples/azure-lite.yaml b/docs/adr/assets/runtime-examples/azure-lite.yaml index 81098971..81125a6a 100644 --- a/docs/adr/assets/runtime-examples/azure-lite.yaml +++ b/docs/adr/assets/runtime-examples/azure-lite.yaml @@ -1,22 +1,23 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: azure-lite kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: azure-lite namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: azure-lite # spec.shoot.purpose is required purpose: production # spec.shoot.region is required @@ -50,7 +51,7 @@ spec: # Will be modified by the SRE image: name: gardenlinux - version: 1312.3.0 + 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: @@ -58,7 +59,7 @@ spec: size: 50Gi # spec.shoot.worker.zones is required zones: - - 1 + - "1" # spec.shoot.workers.name is optional, if not provided default will be used name: cpu-worker-0 # spec.shoot.workers.minimum is required @@ -73,6 +74,7 @@ spec: maxUnavailable: 0 # spec.shoot.Networking is required networking: + type: calico pods: 10.96.0.0/13 nodes: 10.250.0.0/22 services: 10.104.0.0/13 diff --git a/docs/adr/assets/runtime-examples/azure.yaml b/docs/adr/assets/runtime-examples/azure.yaml index ef4416d1..f797fb70 100644 --- a/docs/adr/assets/runtime-examples/azure.yaml +++ b/docs/adr/assets/runtime-examples/azure.yaml @@ -1,22 +1,23 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: azure-full kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: azure-full namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: azure-full # spec.shoot.purpose is required purpose: production # spec.shoot.region is required @@ -26,7 +27,7 @@ spec: # 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 - enforceSeedLocation: "true" + enforceSeedLocation: true kubernetes: # spec.shoot.kubernetes.version is optional, when not provided default will be used version: "1.28.7" @@ -61,7 +62,8 @@ spec: # Will be modified by the SRE image: name: gardenlinux - version: 1312.3.0 + version: 1443.9.0 + name: "worker-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: @@ -69,11 +71,9 @@ spec: size: 50Gi # spec.shoot.workers.zones is required zones: - - 1 - - 2 - - 3 - # spec.shoot.workers.name is optional, if not provided default will be used - name: cpu-worker-0 + - "1" + - "2" + - "3" # spec.shoot.workers.minimum is required minimum: 3 # spec.shoot.workers.maximum is required @@ -86,6 +86,7 @@ spec: maxUnavailable: 0 # spec.shoot.Networking is required networking: + type: calico pods: 10.96.0.0/13 nodes: 10.250.0.0/22 services: 10.104.0.0/13 From 4fa5da64280764427df96cb9cc8367a799a5db60 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Fri, 16 Aug 2024 18:03:59 +0200 Subject: [PATCH 5/7] GCP updated --- docs/adr/assets/runtime-examples/gcp.yaml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/adr/assets/runtime-examples/gcp.yaml b/docs/adr/assets/runtime-examples/gcp.yaml index 48b2db7f..48c60d88 100644 --- a/docs/adr/assets/runtime-examples/gcp.yaml +++ b/docs/adr/assets/runtime-examples/gcp.yaml @@ -1,32 +1,33 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: gcp-full kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: gcp-full namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: gcp-full # spec.shoot.purpose is required purpose: production # spec.shoot.region is required - region: europe-west3 + region: us-central1 # spec.shoot.platformRegion is required 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 - enforceSeedLocation: "true" + enforceSeedLocation: true kubernetes: # spec.shoot.kubernetes.version is optional, when not provided default will be used version: "1.28.7" @@ -61,7 +62,7 @@ spec: # Will be modified by the SRE image: name: gardenlinux - version: 1312.3.0 + 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: @@ -69,9 +70,9 @@ spec: size: 50Gi # spec.shoot.workers.zones is required zones: - - europe-west3a - - europe-west3b - - europe-west3c + - us-central1-a + - us-central1-b + - us-central1-c # spec.shoot.workers.name is optional, if not provided default will be used name: cpu-worker-0 # spec.shoot.workers.minimum is required @@ -86,6 +87,7 @@ spec: maxUnavailable: 0 # spec.shoot.Networking is required networking: + type: calico pods: 10.96.0.0/13 nodes: 10.250.0.0/22 services: 10.104.0.0/13 From e20a3a06d1d8eec9fa0509a65ab49fdafe707218 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Fri, 16 Aug 2024 18:20:55 +0200 Subject: [PATCH 6/7] OpenStack updated --- .../assets/runtime-examples/sap-converged-cloud.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/adr/assets/runtime-examples/sap-converged-cloud.yaml b/docs/adr/assets/runtime-examples/sap-converged-cloud.yaml index 9a61e7c2..a9d4bbfa 100644 --- a/docs/adr/assets/runtime-examples/sap-converged-cloud.yaml +++ b/docs/adr/assets/runtime-examples/sap-converged-cloud.yaml @@ -1,22 +1,23 @@ -apiVersion: infrastructuremanager.kyma-project.io/v1alpha1 +apiVersion: infrastructuremanager.kyma-project.io/v1 kind: Runtime metadata: labels: + kyma-project.io/controlled-by-provisioner: "false" kyma-project.io/instance-id: instance-id kyma-project.io/runtime-id: runtime-id kyma-project.io/broker-plan-id: plan-id kyma-project.io/broker-plan-name: plan-name kyma-project.io/global-account-id: global-account-id kyma-project.io/subaccount-id: subAccount-id - kyma-project.io/shoot-name: shoot-name + kyma-project.io/shoot-name: ops-full kyma-project.io/region: region operator.kyma-project.io/kyma-name: kymaName - name: runtime-id + name: ops-full namespace: kcp-system spec: shoot: # spec.shoot.name is required - name: shoot-name + name: ops-full # spec.shoot.purpose is required purpose: production # spec.shoot.region is required @@ -61,7 +62,7 @@ spec: # Will be modified by the SRE image: name: gardenlinux - version: 1312.3.0 + version: 1443.9.0 # Note: KEB doesn't specify the volume, Gardener defaults used # spec.shoot.workers.zones is optional zones: @@ -82,6 +83,7 @@ spec: maxUnavailable: 0 # spec.shoot.Networking is required networking: + type: calico pods: 10.96.0.0/13 nodes: 10.250.0.0/22 services: 10.104.0.0/13 From 4844979a0e3965d3b7ceb27b9c64500a18cf1fc2 Mon Sep 17 00:00:00 2001 From: Arkadiusz Galwas Date: Thu, 22 Aug 2024 10:42:58 +0200 Subject: [PATCH 7/7] Fixed indentation is azure-lite.yaml --- docs/adr/assets/runtime-examples/azure-lite.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adr/assets/runtime-examples/azure-lite.yaml b/docs/adr/assets/runtime-examples/azure-lite.yaml index 81125a6a..5928bd6c 100644 --- a/docs/adr/assets/runtime-examples/azure-lite.yaml +++ b/docs/adr/assets/runtime-examples/azure-lite.yaml @@ -37,7 +37,7 @@ spec: issuerURL: https://my.cool.tokens.com signingAlgs: - RS256 - usernameClaim: sub + usernameClaim: sub # spec.shoot.provider is required provider: # spec.shoot.provider.type is required