Separate `apis/<api>/[ver]/helper/helper.go` into different `helper_<resource>.go` files #11083

RadaBDimitrova · 2024-12-20T15:19:06Z

How to categorize this PR?

/area quality
/kind enhancement

What this PR does / why we need it:
Following the pattern of defaults_<resource>.go and types_<resource>.go this PR separates logic in apis/<api>/[ver]/helper/helper.go in order to have easier access to helper functions of the same logical group.

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

Special notes for your reviewer:
N/A

Release note:

NONE

RadaBDimitrova · 2024-12-20T15:53:10Z

/retest

Kostov6 · 2024-12-30T09:01:25Z

/retest

RadaBDimitrova · 2024-12-30T10:12:20Z

/retest

RadaBDimitrova · 2024-12-30T11:22:59Z

/retest

RadaBDimitrova · 2024-12-30T12:49:08Z

/retest

plkokanov · 2025-01-10T11:35:19Z

/assign

ialidzhikov · 2025-01-14T07:48:20Z

/assign

Kostov6

Surface level old comments. Will do more later

pkg/apis/core/v1beta1/helper/helper_shoot.go

pkg/apis/core/v1beta1/helper/backupbucket.go

pkg/apis/core/v1beta1/helper/cloudprofile.go

pkg/apis/core/v1beta1/helper/shoot.go

pkg/apis/core/v1beta1/helper/backupbucket.go

pkg/apis/seedmanagement/v1alpha1/helper/gardenlet.go

pkg/apis/core/v1beta1/helper/common.go

ialidzhikov · 2025-01-15T05:45:38Z

/test pull-gardener-apidiff

RadaBDimitrova · 2025-01-15T14:49:15Z

Error: bad file 'hack/../example/gardener-local/gardenlet/operator/patch-imagevector-overwrite.yaml': yaml: line 13: could not find expected ':'

Error: UPGRADE FAILED: update: failed to update: Internal error occurred: failed calling webhook "validate-kubeconfig-secrets.gardener.cloud": failed to call webhook: Post "[https://gardener-admission-controller.garden.svc:443/webhooks/validate-kubeconfig-secrets?timeout=10s](https://gardener-admission-controller.garden.svc/webhooks/validate-kubeconfig-secrets?timeout=10s)": dial tcp 10.2.2.10:443: connect: connection refused

[FAILED] Timed out after 5.001s. The function passed to Eventually failed at /home/prow/go/src/github.com/gardener/gardener/test/integration/scheduler/shoot/shoot_test.go:88 with: Expected <*v1beta1.LastOperation | 0xc006245950>: { Description: "Failed to schedule Shoot: none of the 1 seeds is valid for scheduling (not deleting, visible and ready)", LastUpdateTime: { Time: 2025-01-15T13:55:49Z, }, Progress: 0, State: "Pending", Type: "Create", } to be nil In [It] at: /home/prow/go/src/github.com/gardener/gardener/test/integration/scheduler/shoot/shoot_test.go:89 @ 01/15/25 13:55:54.393
/retest

RadaBDimitrova · 2025-01-15T17:58:14Z

/retest

ialidzhikov

Final cosmetic suggestions from my side, otherwise lgtm

pkg/apis/core/v1beta1/helper/common_test.go

pkg/apis/core/v1beta1/helper/common.go

pkg/apis/core/v1beta1/helper/managedseed_test.go

pkg/apis/core/v1beta1/helper/shoot_test.go

pkg/apis/extensions/v1alpha1/helper/dnsrecord_test.go

pkg/apis/extensions/v1alpha1/helper/network_test.go

pkg/apis/extensions/v1alpha1/helper/operatingsystemconfig_test.go

pkg/apis/extensions/v1alpha1/helper/worker_test.go

ialidzhikov

/lgtm

gardener-prow · 2025-01-21T08:05:04Z

LGTM label has been added.

Git tree hash: bf2c94e3991a3248ab4ddefa9e6cb50c4f01508b

gardener-prow · 2025-01-21T08:45:38Z

@RadaBDimitrova: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-gardener-check-renovate-config	`3d02267`	link	true	`/test pull-gardener-check-renovate-config`

Full PR test history. Your PR dashboard. Command help for this repository.
Please help us cut down on flakes by linking this test failure to an open flake report or filing a new flake report if you can't find an existing one. Also see our testing guideline for how to avoid and hunt flakes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

RadaBDimitrova · 2025-01-21T08:59:29Z

/retest

plkokanov

/lgtm

gardener-prow · 2025-01-21T17:08:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ialidzhikov

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:

~~OWNERS~~ [ialidzhikov]

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

…resource>.go` files (gardener#11083) * /core/v1beta1 * /extensions/v1alpha1 * /operator/v1alpha1 * /resources/v1alpha1 * /seedmanagement/v1alpha1 * run make generate * run make add-license-headers * remove helper_ from names * run make format * separate core/v1beta1/helper tests and rename managedresource * separate extensions/v1alpha1/helper tests * separate operator/v1alpha1/helper tests * separate seedmanagement/v1alpha1/helper tests * minor reordering of functions in tests * fix typo * run make format * Address PR review feedback --------- Co-authored-by: Ismail Alidzhikov <9372594+ialidzhikov@users.noreply.github.com>

gardener-prow bot added area/quality Output qualification (tests, checks, scans, automation in general, etc.) related kind/enhancement Enhancement, improvement, extension cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. labels Dec 20, 2024

gardener-prow bot requested review from ary1992 and timuthy December 20, 2024 15:19

gardener-prow bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 20, 2024

RadaBDimitrova marked this pull request as draft December 20, 2024 15:41

gardener-prow bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 20, 2024

RadaBDimitrova marked this pull request as ready for review December 30, 2024 07:01

gardener-prow bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 30, 2024

gardener-prow bot requested review from acumino and marc1404 December 30, 2024 07:01

gardener-prow bot assigned plkokanov Jan 10, 2025

gardener-prow bot assigned ialidzhikov Jan 14, 2025

Kostov6 reviewed Jan 14, 2025

View reviewed changes

pkg/apis/core/v1beta1/helper/helper_shoot.go Outdated Show resolved Hide resolved

pkg/apis/core/v1beta1/helper/helper_shoot.go Outdated Show resolved Hide resolved

ialidzhikov requested changes Jan 14, 2025

View reviewed changes

plkokanov requested changes Jan 14, 2025

View reviewed changes

pkg/apis/core/v1beta1/helper/common.go Show resolved Hide resolved

gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 15, 2025

RadaBDimitrova added 2 commits January 15, 2025 15:17

/core/v1beta1

2275e19

/extensions/v1alpha1

dc928c6

RadaBDimitrova added 6 commits January 15, 2025 15:17

run make format

a88c8ac

separate core/v1beta1/helper tests and rename managedresource

b8ea444

separate extensions/v1alpha1/helper tests

6faab16

separate operator/v1alpha1/helper tests

34b5f42

separate seedmanagement/v1alpha1/helper tests

782f502

minor reordering of functions in tests

7df3245

RadaBDimitrova force-pushed the enhancement/separate-helper branch from 3d02267 to 7df3245 Compare January 15, 2025 13:19

gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 15, 2025

RadaBDimitrova added 2 commits January 15, 2025 15:34

fix typo

7d17cbb

run make format

4ed651d

ialidzhikov requested review from Kostov6, ialidzhikov and plkokanov January 20, 2025 09:09

ialidzhikov reviewed Jan 20, 2025

View reviewed changes

Address PR review feedback

d931120

ialidzhikov reviewed Jan 21, 2025

View reviewed changes

gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2025

ialidzhikov mentioned this pull request Jan 21, 2025

Move non-client gardener resource functions to apis/<api>/[ver]/helper/helper_<resource>.go #10426

Closed

2 tasks

plkokanov reviewed Jan 21, 2025

View reviewed changes

ialidzhikov approved these changes Jan 21, 2025

View reviewed changes

gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2025

gardener-prow bot merged commit c2ce545 into gardener:master Jan 21, 2025
19 checks passed

oliver-goetz mentioned this pull request Jan 22, 2025

Restrict gardenlet access for Seed resources #11062

Merged

Separate apis/<api>/[ver]/helper/helper.go into different helper_<resource>.go files #11083

Separate apis/<api>/[ver]/helper/helper.go into different helper_<resource>.go files #11083

Uh oh!

Conversation

RadaBDimitrova commented Dec 20, 2024 • edited by ialidzhikov Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RadaBDimitrova commented Dec 20, 2024

Uh oh!

Kostov6 commented Dec 30, 2024

Uh oh!

RadaBDimitrova commented Dec 30, 2024

Uh oh!

RadaBDimitrova commented Dec 30, 2024

Uh oh!

RadaBDimitrova commented Dec 30, 2024

Uh oh!

plkokanov commented Jan 10, 2025

Uh oh!

ialidzhikov commented Jan 14, 2025

Uh oh!

Kostov6 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ialidzhikov commented Jan 15, 2025

Uh oh!

RadaBDimitrova commented Jan 15, 2025

Uh oh!

RadaBDimitrova commented Jan 15, 2025

Uh oh!

ialidzhikov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ialidzhikov left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Jan 21, 2025

Uh oh!

gardener-prow bot commented Jan 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RadaBDimitrova commented Jan 21, 2025

Uh oh!

plkokanov left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Jan 21, 2025

Uh oh!

Uh oh!

Uh oh!

Separate `apis/<api>/[ver]/helper/helper.go` into different `helper_<resource>.go` files #11083

Separate `apis/<api>/[ver]/helper/helper.go` into different `helper_<resource>.go` files #11083

RadaBDimitrova commented Dec 20, 2024 •

edited by ialidzhikov

Loading

Kostov6 left a comment •

edited

Loading

gardener-prow bot commented Jan 21, 2025 •

edited

Loading