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 gardenadm in the /dev-setup folder

  • /dev-setup/gardenadm/machines contains the machine config for the high-touch scenario (machine StatefulSet and related resources)
  • /dev-setup/gardenadm/resources is a Kustomization with overlays for the high-touch and the medium-touch scenario
  • Generated files (e.g., the manifests.yaml from the resources Kustomization, but also the .skaffold-image and .imagevector-overwrite.yaml) are stored in /dev-setup/gardenadm/resources/generated

Now, there should be no gardenadm dev/test setup-related config anymore in the example folder.

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

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

Release note:

NONE

@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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 16, 2025
@rfranzke rfranzke force-pushed the devsetup-gardenadm branch 2 times, most recently from aa22627 to 9813fc2 Compare June 16, 2025 14:34
@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 17, 2025
@rfranzke rfranzke force-pushed the devsetup-gardenadm branch from 9813fc2 to 6d3a70f Compare June 17, 2025 10:25
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 17, 2025
@timebertt
Copy link
Member

/assign

Copy link
Member

@timebertt timebertt left a comment

Choose a reason for hiding this comment

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

Generally lgtm.
Thanks for your efforts on reworking this mess 😄

rfranzke added 10 commits June 18, 2025 08:11
…ardenadm`

In a later commit, they will actually be moved to `/dev-setup/gardenadm/resources`.
It doesn't fit perfectly there since it is not a typical Kustomize
component/part, but it doesn't make sense to move it elsewhere, so let's
live with it.
…tup/gardenadm/resources`

Since this `resources` folder is no typical Kustomize part anyways,
let's also move the other files there so that they are at one place.
`/dev-setup/extensions/networking-{calico,cilium}` now have the same
structure like `/dev-setup/extensions/provider-local`
Otherwise, `gardenadm` might complain if we put the generated files into
the same directory that also contains the `kustomzation.yaml`:

```
Error: failed reading Kubernetes resources from config directory ./dev-setup/gardenadm/resources/medium-touch: failed reading Kubernetes resources from config directory: failed decoding resource at index 0 in kustomization.yaml: no kind "Kustomization" is registered for version "kustomize.config.k8s.io/v1beta1" in scheme "pkg/runtime/scheme.go:110"
exit status 1
```
@rfranzke rfranzke force-pushed the devsetup-gardenadm branch from 6d3a70f to 50717ac Compare June 18, 2025 06:13
@rfranzke rfranzke requested a review from timebertt June 18, 2025 06:14
Copy link
Member

@timebertt timebertt left a comment

Choose a reason for hiding this comment

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

Thanks!
/lgtm

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

gardener-prow bot commented Jun 18, 2025

LGTM label has been added.

Git tree hash: a733c181a818c3075463400d111a407c9c0cee6c

Copy link
Member

@oliver-goetz oliver-goetz left a comment

Choose a reason for hiding this comment

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

The new dev-setup is growing. Nice 🚀

Copy link
Contributor

gardener-prow bot commented Jun 24, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oliver-goetz

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 24, 2025
@gardener-prow gardener-prow bot merged commit 07d4562 into gardener:master Jun 24, 2025
19 checks passed
@rfranzke rfranzke deleted the devsetup-gardenadm branch June 24, 2025 14:13
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants