Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump k8s dependencies to 1.30 #102

Merged
merged 10 commits into from
Oct 21, 2024
Merged

Bump k8s dependencies to 1.30 #102

merged 10 commits into from
Oct 21, 2024

Conversation

Neo2308
Copy link
Contributor

@Neo2308 Neo2308 commented Oct 9, 2024 •
edited
Loading

  • Updated k8s dependencies to 1.30
  • Updated kubebuilder to v4

TODO:

Relates to: operator-framework/operator-sdk#6730

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 9, 2024
@Neo2308 Neo2308 mentioned this pull request Oct 9, 2024
Closed
12 tasks
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2024
Neo2308 and others added 2 commits October 17, 2024 10:16
@Neo2308 @acornett21
Update k8s dependencies to 1.30
55d6d06 
* Updated k8s dependencies to 1.30
* Updated kubebuilder to v4
@acornett21
updating pip and piplock files
a6ff0a6 
Signed-off-by: Adam D. Cornett <[email protected]>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 17, 2024
@acornett21 acornett21 force-pushed the bump-kubebuilder-v4 branch 4 times, most recently from b82a3cb to 96cb34a Compare October 18, 2024 23:33
@acornett21
fixing generation issues
34afe5d 
Signed-off-by: Adam D. Cornett <[email protected]>
@Neo2308 Neo2308 changed the title {WIP} Bump k8s dependencies to 1.30 Bump k8s dependencies to 1.30 Oct 19, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 19, 2024
@Neo2308 Neo2308 mentioned this pull request Oct 21, 2024
Merged
3 tasks
@acornett21
Copy link
Contributor

I tested the scaffolding of these changes by referencing this commit in operator-sdk repo's go mod file, and everything worked successfully. Will retest running the operator when the main image is pushed to quay.

@acornett21 acornett21 merged commit d5cde0c into operator-framework:main Oct 21, 2024
9 checks passed
@Neo2308 Neo2308 deleted the bump-kubebuilder-v4 branch October 22, 2024 03:07
arkadeepsen
arkadeepsen reviewed Oct 22, 2024
View reviewed changes
hack/generate/samples/ansible/memcached_molecule.go
Comment on lines -127 to -131
log.Info("enabling metrics in the manager")
err = kbutil.UncommentCode(
filepath.Join(sample.Dir(), "config", "default", "kustomization.yaml"),
"#- path: manager_metrics_patch.yaml", "#")
pkg.CheckError("enabling metrics endpoint", err)
Copy link

Choose a reason for hiding this comment

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

I think these lines got inadvertently removed which were added as part of #90

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not quite sure if this should have remained or removed. My reasoning for removing was because there was an error saying that the commented section was not found. I thought it was because it is already uncommented. Also, I wasn't able to find where this was being uncommented, hence I removed it. Should this be added back?

cc: @joelanford

Copy link
Contributor

@acornett21 acornett21 Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@arkadeepsen metrics is now enabled by default in kubebuilder so there is nothing that needs to uncomment. See main where the kustomize file has this enabled.

ansible-operator-plugins/testdata/memcached-molecule-operator/config/default/kustomization.yaml

Lines 30 to 32 in 9871a1e

- path: manager_metrics_patch.yaml
target:
kind: Deployment

Copy link

Choose a reason for hiding this comment

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

Ack. Thanks for the clarification.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arkadeepsen arkadeepsen arkadeepsen left review comments

@acornett21 acornett21 acornett21 approved these changes

@anik120 anik120 Awaiting requested review from anik120

@varshaprasad96 varshaprasad96 Awaiting requested review from varshaprasad96

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Neo2308 @acornett21 @arkadeepsen @openshift-merge-robot