🌱 Fail startup if no CRDs are detected #2629

chrischdi · 2024-01-18T12:44:47Z

What this PR does / why we need it:

Makes CAPV fail on startup if no CRD's exist and mode detection won't add any manager.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

chrischdi · 2024-01-18T12:45:07Z

/cherry-pick release-1.9

k8s-infra-cherrypick-robot · 2024-01-18T12:45:09Z

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.9

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/test-infra repository.

chrischdi · 2024-01-18T12:45:10Z

/cherry-pick release-1.8

k8s-infra-cherrypick-robot · 2024-01-18T12:45:12Z

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

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/test-infra repository.

sbueringer · 2024-01-18T12:46:52Z

main.go

 			if err := setupSupervisorControllers(ctx, controllerCtx, mgr, tracker); err != nil {
 				return fmt.Errorf("setupSupervisorControllers: %w", err)
 			}
 		} else {
 			setupLog.Info(fmt.Sprintf("CRD for %s not loaded, skipping.", gvr.String()))
 		}

+		// Continuing startup does not make sense without having managers added.
+		if !isSupervisorCRDLoaded && !isNonSupervisorCRDLoaded {
+			return errors.New("neither supervisor nor non-supervisor CRD detected")


Suggested change

return errors.New("neither supervisor nor non-supervisor CRD detected")

return errors.New("neither supervisor nor non-supervisor CRDs detected")

codecov · 2024-01-18T12:48:39Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b6226a7) 64.83% compared to head (79781ed) 64.79%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2629      +/-   ##
==========================================
- Coverage   64.83%   64.79%   -0.05%     
==========================================
  Files         118      118              
  Lines        8580     8580              
==========================================
- Hits         5563     5559       -4     
- Misses       2588     2592       +4     
  Partials      429      429

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

sbueringer · 2024-01-18T12:49:03Z

/cherry-pick release-1.7

k8s-infra-cherrypick-robot · 2024-01-18T12:49:05Z

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

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/test-infra repository.

sbueringer · 2024-01-18T12:55:17Z

Thx!

/lgtm
/approve

k8s-ci-robot · 2024-01-18T12:55:22Z

LGTM label has been added.

Git tree hash: 06c18e38ed78aa76032d9527d2208bf5e65f894b

k8s-ci-robot · 2024-01-18T12:55:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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~~ [sbueringer]

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

k8s-infra-cherrypick-robot · 2024-01-18T13:10:19Z

@sbueringer: #2629 failed to apply on top of branch "release-1.7":

Applying: Fail startup if no CRDs are detected
Using index info to reconstruct a base tree...
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fail startup if no CRDs are detected
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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/test-infra repository.

k8s-infra-cherrypick-robot · 2024-01-18T13:10:54Z

@chrischdi: new pull request created: #2631

In response to this:

/cherry-pick release-1.9

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/test-infra repository.

k8s-infra-cherrypick-robot · 2024-01-18T13:11:27Z

@chrischdi: #2629 failed to apply on top of branch "release-1.8":

Applying: Fail startup if no CRDs are detected
Using index info to reconstruct a base tree...
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fail startup if no CRDs are detected
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.8

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/test-infra repository.

k8s-ci-robot assigned sbueringer Jan 18, 2024

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 18, 2024

k8s-ci-robot requested review from sbueringer and srm09 January 18, 2024 12:44

chrischdi changed the title ~~Fail startup if no CRDs are detected~~ 🌱 Fail startup if no CRDs are detected Jan 18, 2024

k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 18, 2024

sbueringer reviewed Jan 18, 2024

View reviewed changes

Fail startup if no CRDs are detected

79781ed

chrischdi force-pushed the pr-fail-startup-no-crds branch from 58ac2ac to 79781ed Compare January 18, 2024 12:49

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 18, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2024

k8s-ci-robot merged commit 83722c3 into kubernetes-sigs:main Jan 18, 2024
18 checks passed

k8s-ci-robot added this to the v1.9 milestone Jan 18, 2024

k8s-infra-cherrypick-robot mentioned this pull request Jan 18, 2024

[release-1.9] 🌱 Fail startup if no CRDs are detected #2631

Merged

This was referenced Jan 18, 2024

[release-1.8] 🌱 Fail startup if no CRDs are detected #2632

Merged

[release-1.7] 🌱 Fail startup if no CRDs are detected #2633

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌱 Fail startup if no CRDs are detected #2629

🌱 Fail startup if no CRDs are detected #2629

chrischdi commented Jan 18, 2024

chrischdi commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

chrischdi commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

sbueringer Jan 18, 2024

codecov bot commented Jan 18, 2024 •

edited

Loading

sbueringer commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

sbueringer commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

	return errors.New("neither supervisor nor non-supervisor CRD detected")
	return errors.New("neither supervisor nor non-supervisor CRDs detected")

🌱 Fail startup if no CRDs are detected #2629

🌱 Fail startup if no CRDs are detected #2629

Conversation

chrischdi commented Jan 18, 2024

chrischdi commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

chrischdi commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

sbueringer Jan 18, 2024

Choose a reason for hiding this comment

codecov bot commented Jan 18, 2024 • edited Loading

Codecov Report

sbueringer commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

sbueringer commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

k8s-infra-cherrypick-robot commented Jan 18, 2024

codecov bot commented Jan 18, 2024 •

edited

Loading