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 network policy api version + Kubernetes libraries to 1.29 #4207

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Bump network policy api version + Kubernetes libraries to 1.29 #4207

merged 1 commit into from
Mar 15, 2024

Conversation

tssurya
Copy link
Member

@tssurya tssurya commented Mar 8, 2024 •
edited

This PR has been co-authored with @bpickard22 and relevant bits from #4108 were taken. We combined his and my bits into this one so that we can unblock admin network policy PR: #4164.

However only the libraries are bumped. CI is still running 1.28 clusters and @bpickard22 's PR will take care of updating:

  • kind
  • CI
  • e2e
  • metallb

- What this PR does and why is it needed

We bump:

  1. go version to 1.21
  2. k8s libraries to 1.29.2
  3. network-policy-api to latest (rather a bump to latest, which depends on 1.29.2)

This PR blocks #4164

- Special notes for reviewers

- How to verify it

- Description for the changelog

@tssurya tssurya force-pushed the bump-network-policy-api branch 2 times, most recently from 9e0d93f to e9424be Compare March 8, 2024 16:57
@bpickard22
Copy link
Contributor

/lgtm thanks for splitting this out with me

bpickard22
bpickard22 reviewed Mar 8, 2024
View reviewed changes
go-controller/go.mod Outdated Show resolved Hide resolved
@tssurya
Copy link
Member Author

tssurya commented Mar 8, 2024

/assign @trozet : this one is mostly go mod update changes.. ready to go in if CI is green.

@tssurya tssurya changed the title Bump network policy api version Bump network policy api version + Kubernetes libraries to 1.29 Mar 8, 2024
@tssurya tssurya added this to the v1.0.0 milestone Mar 11, 2024
@tssurya tssurya mentioned this pull request Mar 12, 2024
Closed
8 tasks
@tssurya tssurya added dependencies Pull requests that update a dependency file go Pull requests that update Go code kind/feature All issues/PRs that are new features feature/admin-network-policy area/core-kubernetes Issues related to core kubernetes like pods, services, endpoints, endpointslices labels Mar 12, 2024
@netlify Netlify
Copy link

netlify bot commented Mar 12, 2024 •
edited

❌ Deploy Preview for subtle-torrone-bb0c84 failed.

Name Link
🔨 Latest commit 86db806
🔍 Latest deploy log https://app.netlify.com/sites/subtle-torrone-bb0c84/deploys/65f447e9f392930008444241

@coveralls
Copy link

Coverage Status

coverage: 52.429% (+0.01%) from 52.418%
when pulling b689e29 on tssurya:bump-network-policy-api
into de3bdc0 on ovn-org:master.

@maiqueb maiqueb mentioned this pull request Mar 12, 2024
Merged
jcaamano
jcaamano reviewed Mar 14, 2024
View reviewed changes
Copy link
Contributor

@jcaamano jcaamano left a comment •
edited

Choose a reason for hiding this comment

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

Suggested some log improvements.

I think the commit split & order is all over the place :P
I would squash commits #1, #3 and #4 together. And #2 and #5 together.

go-controller/pkg/clustermanager/egressip_controller.go Outdated Show resolved Hide resolved
go-controller/pkg/clustermanager/node/node_allocator.go Outdated Show resolved Hide resolved
go-controller/pkg/clustermanager/node/node_allocator.go Outdated Show resolved Hide resolved
go-controller/pkg/node/controllers/egressip/namespace.go Outdated Show resolved Hide resolved
go-controller/pkg/node/node_ip_handler_linux.go Outdated Show resolved Hide resolved
go-controller/pkg/ovn/egressip.go Outdated Show resolved Hide resolved
go-controller/pkg/ovn/zone_interconnect/zone_ic_handler.go Outdated Show resolved Hide resolved
go-controller/pkg/ovndbmanager/ovndbmanager.go Outdated Show resolved Hide resolved
go-controller/pkg/util/kube.go Outdated Show resolved Hide resolved
go-controller/pkg/util/util.go Outdated Show resolved Hide resolved
@tssurya
Copy link
Member Author

tssurya commented Mar 14, 2024

Suggested some log improvements.

I think the commit split & order is all over the place :P I would squash commits #1, #3 and #4 together. And #2 and #5 together.

haha yeah I can see why that seems like that, I deff agree 1 and 3 can be combined, I did the split for easy reviews. However note that I had to do 4 because we did 3 the text logger stuff kinda happened because of the lint fixes
let me combine things as per your suggestion, we could also squash all because ultimately none of the individual commits will compile.

@tssurya tssurya force-pushed the bump-network-policy-api branch 4 times, most recently from f1e704c to 22c3845 Compare March 14, 2024 20:45
@tssurya
Copy link
Member Author

tssurya commented Mar 14, 2024

IN this last push I addressed the two comments you had left on second around, I hope I got them all.

@tssurya @bpickard22
Update network-policy-api to pickup latest API
86db806 
go get sigs.k8s.io/network-policy-api@d48faeeb0e02
go mod tidy
go mod vendor

While doing the network-policy-api updates, it
depended on updating kube to 1.29.2 => just the
libraries. Took relevant bits from:
ovn-org@a55c19c

Co-authored-by: Ben Pickard <bpickard@redhat.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Accommodate internal Peer type split

Peer has currently split into egress and
ingress peers for ANP and BANP. Let's change
the internal types.go file to accommodate those
changes.

Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Bump linter and fix formatting

Pulling in relevant changes from
ovn-org@a55c19c

Co-Authored-By: Ben Pickard <bpickard@redhat.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Update klogr to textlogger

klogr is deprecated, we must use textlogger instead.

Co-Authored-By: Ben Pickard <bpickard@redhat.com>
Signed-Off-By: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Install latest CRDs for ANP & BANP

Bump the version of anp&banp crds we install.

Signed-Off-By: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Co-authored-by: Ben Pickard <bpickard@redhat.com>
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
@jcaamano jcaamano merged commit f6270d0 into ovn-org:master Mar 15, 2024
34 of 38 checks passed
@tssurya tssurya mentioned this pull request Mar 15, 2024
Merged
@tssurya tssurya linked an issue Mar 26, 2024 that may be closed by this pull request
Implement Admin Network Policy API in OVNK #4214
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maiqueb maiqueb maiqueb approved these changes

@bpickard22 bpickard22 bpickard22 left review comments

@jcaamano jcaamano jcaamano approved these changes

@trozet trozet Awaiting requested review from trozet

@dcbw dcbw Awaiting requested review from dcbw

@girishmg girishmg Awaiting requested review from girishmg

Assignees
No one assigned
Labels
area/core-kubernetes Issues related to core kubernetes like pods, services, endpoints, endpointslices dependencies Pull requests that update a dependency file feature/admin-network-policy go Pull requests that update Go code kind/feature All issues/PRs that are new features
Projects
None yet
Milestone
v1.0.0
Development

Successfully merging this pull request may close these issues.

Implement Admin Network Policy API in OVNK
5 participants
@tssurya @bpickard22 @coveralls @jcaamano @maiqueb