Skip to content

Conversation

rfranzke
Copy link
Member

How to categorize this PR?

/area dev-productivity
/kind cleanup

What this PR does / why we need it:
This PR reworks the dev/e2e setup for ha-single-zone in the /dev-setup folder.

  • This scenario is now based on the gardener-operator setup.
  • gardenlet in the second kind cluster is now also deployed via the seedmanagement.gardener.cloud/v1alpha1.Gardenlet resource via gardener-operator.
  • On the way, introduced a workaround for an issue with communicating with the virtual garden cluster from the local machine. This issue occurs when there is no istio-ingressgateway running on the control plane node. Our workaround increases the replicas to 3 such that at least one replica gets scheduled to the control plane node (due to the spread constraints). Eventually, we should revert it and rather fix the actual networking problem. cc @ScheererJ

Which issue(s) this PR fixes:
Part of #11958

Special notes for your reviewer:
/cc @oliver-goetz

Release note:

NONE

@gardener-prow gardener-prow bot requested a review from oliver-goetz June 17, 2025 14:55
@gardener-prow gardener-prow bot added area/dev-productivity Developer productivity related (how to improve development) kind/cleanup Something that is not needed anymore and can be cleaned up cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. labels Jun 17, 2025
@gardener-prow gardener-prow bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jun 17, 2025
@rfranzke rfranzke force-pushed the devsetup-single-zone branch from cb89ad7 to d4852bf Compare June 17, 2025 15:04
@timuthy
Copy link
Member

timuthy commented Jun 17, 2025

/assign

@rfranzke rfranzke force-pushed the devsetup-single-zone branch 5 times, most recently from 086ffd4 to 2d321cc Compare June 18, 2025 18:45
@oliver-goetz
Copy link
Member

/assign

@rfranzke rfranzke force-pushed the devsetup-single-zone branch from 2d321cc to 11d5236 Compare June 24, 2025 04:59
@rfranzke rfranzke requested a review from oliver-goetz June 24, 2025 05:00
@gardener-prow gardener-prow bot added cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. labels Jun 24, 2025
@rfranzke rfranzke force-pushed the devsetup-single-zone branch from afca986 to 7b03eed Compare June 24, 2025 15:30
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2025
@rfranzke rfranzke force-pushed the devsetup-single-zone branch 3 times, most recently from fb2bd6b to f01d743 Compare June 25, 2025 05:38
@oliver-goetz
Copy link
Member

That was easy 😅
Nice 🥳

/lgtm

rfranzke added 18 commits June 25, 2025 19:23
This way, `make operator-up` also works out-of-the-box.

Next step: Make `make operator-seed-up` work, i.e., registering
a `Garden` and a `Gardenlet` for this new multi-node (3 nodes in the
same zone) setup.
TODOs:
- remove ha-single-zone from skaffold.yaml (and probably many other
  places)
- validate that zones must be unique in Garden and Seed
Otherwise, we might run only 2 replicas, but we have 3 nodes. If none of the
`istio-ingressgateway` pods runs on the control plane node (which has
the port mapping `172.18.255.3:443->31443/tcp`), the virtual garden
cannot be contacted.

```
$ docker ps
CONTAINER ID   IMAGE                  COMMAND                  CREATED         STATUS         PORTS                                                                                                                                                                     NAMES
ab387f3ecc27   kindest/node:v1.32.5   "/usr/local/bin/entr…"   8 minutes ago   Up 8 minutes   0.0.0.0:5001->5001/tcp, 127.0.0.1:62613->6443/tcp, 172.18.255.1:5353->30053/tcp, 172.18.255.1:443->30443/tcp, 172.18.255.3:443->31443/tcp, 172.18.255.1:8132->32132/tcp   gardener-operator-local-control-plane
27257fee5eab   kindest/node:v1.32.5   "/usr/local/bin/entr…"   8 minutes ago   Up 8 minutes                                                                                                                                                                             gardener-operator-local-worker2
c7da6eec61f6   kindest/node:v1.32.5   "/usr/local/bin/entr…"   8 minutes ago   Up 8 minutes                                                                                                                                                                             gardener-operator-local-worker
```

For whatever reason, traffic is not forwarded to the
`istio-ingressgateway` pods running on the worker nodes.

This commit is a temporary workaround and should be reverted later on
when the actual networking problem is fixed.
🎁 ScheererJ 🙈
…one-{up,down}`

In the next commit, we will rename `kind-ha-single-zone-{up,down}`
This way, `gardener-operator` running in first kind cluster deploys the
gardenlet to the second kind cluster.
This way, `gardener-operator` running in the first kind cluster will be
able to talk to the second kind cluster.
Also, the `gardener-operator` folder is no longer used within
`dev/local-backupbuckets` now that the provider extension manages the
`BackupBucket` resource.
It creates new folders with `garden-<uid>`, so let's rather cleanup
those.
more consistency
- GOP deletes the kubeconfig secret after successful installation of
  `gardenlet`
- However, the e2e tests need a kubeconfig secret for the seed in order
  to be able to communicate with it
- Hence, let's simply create a second secret just for
  `gardener-operator`'s installation process
@rfranzke rfranzke force-pushed the devsetup-single-zone branch from 55940f6 to f65b22f Compare June 25, 2025 17:23
@rfranzke rfranzke requested a review from oliver-goetz June 25, 2025 17:24
Copy link
Member

@timuthy timuthy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jun 26, 2025
Copy link
Contributor

gardener-prow bot commented Jun 26, 2025

LGTM label has been added.

Git tree hash: 96de496f8ed2d2cedf59eec30107ee53744da12b

Copy link
Contributor

gardener-prow bot commented Jun 26, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timuthy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 26, 2025
@gardener-prow gardener-prow bot merged commit 213ad5f into gardener:master Jun 26, 2025
19 checks passed
@rfranzke rfranzke deleted the devsetup-single-zone branch June 26, 2025 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dev-productivity Developer productivity related (how to improve development) cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/cleanup Something that is not needed anymore and can be cleaned up lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants