Skip to content

SANDBOX-955: update kube & openshift dependencies to 4.18 #474

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.

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

Merged
merged 4 commits into from
May 6, 2025

Conversation

rsoaresd
Copy link
Contributor

@rsoaresd rsoaresd commented Apr 22, 2025

Description

Update dependencies

Tool/Library Current Version Updates to Version
Operator SDK 1.38 1.39.2
k8s.io/* v0.30.1 v0.31.2
controller-runtime v0.18.4 v0.19.7
controller-tools v0.15.0 v0.16.5

Note

Operator SDK will be updated in the next set of PRs, along with toolchain-cicd and operators update

Issue ticket number and link

SANDBOX-955

Checks

  1. Did you run make generate target? yes

  2. Did make generate change anything in other projects (host-operator, member-operator)? yes

  3. In case of new CRD, did you the following? N/A

  4. In case other projects are changed, please provides PR links.

Copy link
Contributor

@MatousJobanek MatousJobanek left a comment

Choose a reason for hiding this comment

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

Looks great.
If I'm not mistaken, we should be already able to drop the fake GOPATH hack

api/make/generate.mk

Lines 42 to 53 in 708527c

@echo "re-generating the openapi go file..."
@## First, let's clean up anything that might have been left around...
@rm -Rf $(FAKE_GOPATH)
mkdir -p $(FAKE_GOPATH)
@mkdir -p $(CRT_IN_GOPATH)
@## link the packages from the local GOPATH to not have to download them again
@if [ -d $(LOCAL_GOPATH)/pkg ]; then cd $(FAKE_GOPATH) && ln -s $(LOCAL_GOPATH)/pkg; fi
@## link our codebase to the appropriate place in the fake GOPATH
@cd $(CRT_IN_GOPATH) && ln -s ../../../.. api
@## run openapi-gen from within the fake GOPATH (otherwise the package paths would be relative
@## and function names would be different)
GOPATH=$(FAKE_GOPATH) \

what was proposed in this PR #421 but we were not able to do it because of an old controller-runtime version (see comment)
It can be done as separate PR though ;-)

@rsoaresd
Copy link
Contributor Author

Looks great. If I'm not mistaken, we should be already able to drop the fake GOPATH hack

api/make/generate.mk

Lines 42 to 53 in 708527c

@echo "re-generating the openapi go file..."
@## First, let's clean up anything that might have been left around...
@rm -Rf $(FAKE_GOPATH)
mkdir -p $(FAKE_GOPATH)
@mkdir -p $(CRT_IN_GOPATH)
@## link the packages from the local GOPATH to not have to download them again
@if [ -d $(LOCAL_GOPATH)/pkg ]; then cd $(FAKE_GOPATH) && ln -s $(LOCAL_GOPATH)/pkg; fi
@## link our codebase to the appropriate place in the fake GOPATH
@cd $(CRT_IN_GOPATH) && ln -s ../../../.. api
@## run openapi-gen from within the fake GOPATH (otherwise the package paths would be relative
@## and function names would be different)
GOPATH=$(FAKE_GOPATH) \

Thanks for bringing it up! Addressed 697fdae

Copy link
Contributor

@MatousJobanek MatousJobanek left a comment

Choose a reason for hiding this comment

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

Awesome, thanks.
Originally, I wanted to propose updating the operator-sdk version in the README file:

Operator SDK v1.38.0 - download for your development environment [here](https://v1-36-x.sdk.operatorframework.io/docs/installation/#install-from-github-release)

but I don't think that the operator-sdk is actually used in this repo, so the line can be removed.

@rsoaresd
Copy link
Contributor Author

Awesome, thanks. Originally, I wanted to propose updating the operator-sdk version in the README file:

Operator SDK v1.38.0 - download for your development environment [here](https://v1-36-x.sdk.operatorframework.io/docs/installation/#install-from-github-release)

but I don't think that the operator-sdk is actually used in this repo, so the line can be removed.

Great catch, thanks! Addressed d71d6e8

Copy link

@rsoaresd rsoaresd merged commit e4344ee into codeready-toolchain:master May 6, 2025
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants