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.

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

Update capi pkg to v1.8.1 #80

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Conversation

efiacor
Copy link
Contributor

@efiacor efiacor commented Aug 20, 2024

nephio-project/nephio#800

Support for k8s v1.31.0

Tested and verified on free5gc e2e suite

@@ -30,7 +30,7 @@ spec:
enabled: true
enforce: baseline
warn: restricted
version: v1.26.3
version: v1.31.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Would not just updating the kptfile help rather than updating the actual files every time?I could be wrong

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are quite a few changes to the whole pkg so I don't think so. Changes to the CRDs etc.

Copy link
Contributor

Choose a reason for hiding this comment

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

FYI It seems like we should be using something like the link below for changing image names and tags
https://catalog.kpt.dev/set-image/v0.1/set-image-simple/

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 would somewhat agree but this is the base k8s version to be used in the workload clusters.
We could look to set this value dynamically later if needed but for now I am just updating the base version of each 3pp component.

@arora-sagar
Copy link
Contributor

/approve

@vjayaramrh
Copy link
Contributor

@efiacor Thanks for the PR, the PR has a lot of changes. What's a good way for a reviewer to test out changes in a local environment. ? Any steps you can share would be appreciated. Thanks
FYI I am still reviewing the PR currently.

@@ -3,7 +3,6 @@ kind: Namespace
metadata:
labels:
cluster.x-k8s.io/provider: infrastructure-docker
clusterctl.cluster.x-k8s.io: ""
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious as to why this is being removed. Is removing this related to updating the capi pkg to v1.8.1?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

May be somewhat of a clumsy way of doing this upgrade but most of the CRD changes are being pulled in from the assets here - https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.8.1

Copy link
Contributor

Choose a reason for hiding this comment

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

@efiacor Thanks for the response,
For this particular change, what is the corresponding file from https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.8.1 that drove the change? Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

cluster.x-k8s.io/v1beta1: v1beta1
clusterctl.cluster.x-k8s.io: ""
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious as to why the labels at L22 and L24 are being removed? Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above.

@@ -46,6 +41,154 @@ spec:
singular: dockercluster
scope: Namespaced
versions:
- deprecated: true
Copy link
Contributor

Choose a reason for hiding this comment

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

Trying to understand why L44 to L191 is being added now, seems like this is being set as deprecated as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above

Copy link
Contributor

Choose a reason for hiding this comment

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

@efiacor Thanks for the response,
For this particular change, what is the corresponding file from https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.8.1 that drove the change? Thanks

@@ -389,32 +549,22 @@ spec:
storage: true
subresources:
status: {}
status:
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious as to why this section is being removed? Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above

@efiacor
Copy link
Contributor Author

efiacor commented Aug 26, 2024

@efiacor Thanks for the PR, the PR has a lot of changes. What's a good way for a reviewer to test out changes in a local environment. ? Any steps you can share would be appreciated. Thanks FYI I am still reviewing the PR currently.

Thanks for reviewing @vjayaramrh .
What I have done to test the changes is fork the catalog repo, add the changes and then point the sandbox setup to it using the NEPHIO_CATALOG_REPO_URI override.

sudo -E NEPHIO_REPO_DIR=/home/ubuntu/test-infra NEPHIO_DEBUG=false NEPHIO_USER=ubuntu NEPHIO_CATALOG_REPO_URI=https://github.com/efiacor/nephio-pkg-catalog.git K8S_VERSION=v1.31.0 ./init.sh

@vjayaramrh
Copy link
Contributor

FYI Reviewed to be able to understand the changes, hopefully, someone else who is an expert can review as well and approve the merge

Copy link
Member

@liamfallon liamfallon left a comment

Choose a reason for hiding this comment

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

/approve

Copy link
Contributor

nephio-prow bot commented Aug 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arora-sagar, efiacor, liamfallon

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 [arora-sagar,efiacor,liamfallon]

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

@vjayaramrh
Copy link
Contributor

/lgtm

@nephio-prow nephio-prow bot added the lgtm label Aug 29, 2024
@nephio-prow nephio-prow bot merged commit 5fe4fb1 into nephio-project:main Aug 29, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants