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

chore(deps): Bump k8s dependencies to v1.26.11 #3211

Merged
merged 7 commits into from
Dec 6, 2023

Conversation

dlorenc
Copy link
Contributor

@dlorenc dlorenc commented Dec 4, 2023

This addresses a few CVEs, but was slightly challenging because of some Kubernetes API changes.

In particular, the Ingress type signatures changed. This required some surgery on a function that wrapped the extensionsv1beta1 Ingress and v1 Ingress types, attempting to provide some compatibility.

The API changes were kind of tough to deal with, but fortunately the only field required by anything else in this project was the Hostname field, so I changed the function to just normalize the hostnames into a slice.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
  • The title of the PR is (a) conventional with a list of types and scopes found here, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
  • I've signed my commits with DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My builds are green. Try syncing with master if they are not.

@dlorenc
Copy link
Contributor Author

dlorenc commented Dec 4, 2023

This was attempted back here, but it ran into the same k8s api type changes: #2828

Copy link
Contributor

github-actions bot commented Dec 4, 2023

E2E Tests Published Test Results

    4 files      4 suites   3h 28m 38s ⏱️
106 tests   95 ✔️   6 💤   5
434 runs  400 ✔️ 24 💤 10

For more details on these failures, see this check.

Results for commit de739f8.

♻️ This comment has been updated with latest results.

Copy link
Contributor

github-actions bot commented Dec 4, 2023

Go Published Test Results

2 089 tests   2 089 ✔️  2m 49s ⏱️
   118 suites         0 💤
       1 files           0

Results for commit de739f8.

♻️ This comment has been updated with latest results.

@dlorenc dlorenc force-pushed the bumpk8s branch 2 times, most recently from efa4df2 to 2af3430 Compare December 4, 2023 16:48
This addresses a few CVEs, but was slightly challenging because of some Kubernetes API changes.

In particular, the Ingress type signatures changed. This required some surgery on a function that
wrapped the extensionsv1beta1 Ingress and v1 Ingress types, attempting to provide some compatibility.

The API changes were kind of tough to deal with, but fortunately the only field required by anything else
in this project was the Hostname field, so I changed the function to just normalize the hostnames into
a slice.

Signed-off-by: Dan Lorenc <[email protected]>
@dlorenc dlorenc force-pushed the bumpk8s branch 2 times, most recently from 93b840e to 54c4880 Compare December 4, 2023 17:35
Copy link

codecov bot commented Dec 4, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (0ec8519) 81.81% compared to head (de739f8) 81.81%.
Report is 2 commits behind head on master.

Files Patch % Lines
rollout/trafficrouting/alb/alb.go 66.66% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3211      +/-   ##
==========================================
- Coverage   81.81%   81.81%   -0.01%     
==========================================
  Files         135      135              
  Lines       20621    20625       +4     
==========================================
+ Hits        16871    16874       +3     
  Misses       2880     2880              
- Partials      870      871       +1     

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

Signed-off-by: Dan Lorenc <[email protected]>
@zachaller zachaller added this to the v1.7 milestone Dec 5, 2023
@zachaller
Copy link
Collaborator

This is great, I did make a few changes to finish bumping the replace deps which fixed a few more tests but now it looks like manifest generation has some incompatibilities as well.

@dlorenc
Copy link
Contributor Author

dlorenc commented Dec 5, 2023

This is great, I did make a few changes to finish bumping the replace deps which fixed a few more tests but now it looks like manifest generation has some incompatibilities as well.

Thanks! I'm a bit out of my depth now, not sure how to debug these failures.

Copy link

sonarcloud bot commented Dec 5, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

No Coverage information No Coverage information
5.8% 5.8% Duplication

@zachaller zachaller changed the title chore(deps): Bump k8s dependencies to v1.26.0. chore(deps): Bump k8s dependencies to v1.26.11 Dec 5, 2023
@dlorenc
Copy link
Contributor Author

dlorenc commented Dec 5, 2023

Amazing work!!!

@zachaller zachaller merged commit d378ce7 into argoproj:master Dec 6, 2023
25 checks passed
@zachaller
Copy link
Collaborator

Thanks for contributing, was really helpful to have you go through and figure out all the logic required for this upgrade.

@dlorenc dlorenc deleted the bumpk8s branch December 6, 2023 16:25
@dlorenc
Copy link
Contributor Author

dlorenc commented Dec 6, 2023

Thanks for contributing, was really helpful to have you go through and figure out all the logic required for this upgrade.

Thanks a lot for getting it across the line!

ashutosh16 pushed a commit to ashutosh16/argo-rollouts that referenced this pull request Dec 8, 2023
* Bump k8s dependencies to v1.26.0.

This addresses a few CVEs, but was slightly challenging because of some Kubernetes API changes.

In particular, the Ingress type signatures changed. This required some surgery on a function that
wrapped the extensionsv1beta1 Ingress and v1 Ingress types, attempting to provide some compatibility.

The API changes were kind of tough to deal with, but fortunately the only field required by anything else
in this project was the Hostname field, so I changed the function to just normalize the hostnames into
a slice.

Signed-off-by: Dan Lorenc <[email protected]>

* Update codegen.

Signed-off-by: Dan Lorenc <[email protected]>

* bump the replace deps, and re-run codegen

Signed-off-by: Zach Aller <[email protected]>

* bump to 0.26.11 and possible fix for new crd properties

Signed-off-by: Zach Aller <[email protected]>

* remove local changes

Signed-off-by: Zach Aller <[email protected]>

* switch alb test off of extensions and on to v1

Signed-off-by: Zach Aller <[email protected]>

---------

Signed-off-by: Dan Lorenc <[email protected]>
Signed-off-by: Zach Aller <[email protected]>
Co-authored-by: Zach Aller <[email protected]>
Signed-off-by: ashutosh16 <[email protected]>
emily-blixt-ck pushed a commit to emily-blixt-ck/argo-rollouts that referenced this pull request Dec 8, 2023
* Bump k8s dependencies to v1.26.0.

This addresses a few CVEs, but was slightly challenging because of some Kubernetes API changes.

In particular, the Ingress type signatures changed. This required some surgery on a function that
wrapped the extensionsv1beta1 Ingress and v1 Ingress types, attempting to provide some compatibility.

The API changes were kind of tough to deal with, but fortunately the only field required by anything else
in this project was the Hostname field, so I changed the function to just normalize the hostnames into
a slice.

Signed-off-by: Dan Lorenc <[email protected]>

* Update codegen.

Signed-off-by: Dan Lorenc <[email protected]>

* bump the replace deps, and re-run codegen

Signed-off-by: Zach Aller <[email protected]>

* bump to 0.26.11 and possible fix for new crd properties

Signed-off-by: Zach Aller <[email protected]>

* remove local changes

Signed-off-by: Zach Aller <[email protected]>

* switch alb test off of extensions and on to v1

Signed-off-by: Zach Aller <[email protected]>

---------

Signed-off-by: Dan Lorenc <[email protected]>
Signed-off-by: Zach Aller <[email protected]>
Co-authored-by: Zach Aller <[email protected]>
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.

2 participants