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

ACI-CNI 5.2.3.2 upgrade #922

Merged
merged 2 commits into from
Jul 11, 2022
Merged

Conversation

siva-muni
Copy link
Contributor

@siva-muni siva-muni commented Jun 23, 2022

  • Add ACI template
  • Add ACI CNI template and images.

Copy link
Collaborator

@snasovich snasovich left a comment

Choose a reason for hiding this comment

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

@siva-muni, thank you for submitting this PR.

I've left a few specific comments to address.
Additionally, here are couple general comments:

go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
rke/k8s_rke_system_images.go Outdated Show resolved Hide resolved
rke/k8s_rke_system_images.go Outdated Show resolved Hide resolved
rke/k8s_rke_system_images.go Outdated Show resolved Hide resolved
rke/k8s_rke_system_images.go Outdated Show resolved Hide resolved
rke/k8s_rke_system_images.go Outdated Show resolved Hide resolved
rke/templates/aci.go Outdated Show resolved Hide resolved
rke/k8s_rke_system_images.go Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
@snasovich snasovich requested review from kinarashah and a team June 24, 2022 14:10
@siva-muni
Copy link
Contributor Author

snasovich, Thanks for the review, we will address your comments.

@siva-muni
Copy link
Contributor Author

siva-muni commented Jun 29, 2022

We addressed the comments in 91eb1fe, 07b240a, but still we need to test this code once it works fine, We will update, we are working on this.

@siva-muni
Copy link
Contributor Author

With these changes, we are seeing the issues, We will fix and update

@siva-muni
Copy link
Contributor Author

Made few more changes, testing in progress.

Copy link
Collaborator

@snasovich snasovich left a comment

Choose a reason for hiding this comment

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

I see most of my previous comments are addressed, thank you.

Added some more comments to address.

Also, note that per #922 (comment) the best option would be to rebase after PR #921 is merged (should be very soon) to update versions it added with new ACI images /templates instead of introducing new ones. It should be merged very soon, likely today.

rke/templates/aci.go Outdated Show resolved Hide resolved
rke/templates/templates.go Outdated Show resolved Hide resolved
rke/k8s_rke_system_images.go Outdated Show resolved Hide resolved
@snasovich
Copy link
Collaborator

@siva-muni , #921 is now merged so please go ahead with rebasing this PR and updating versions added by #921 instead of introducing new ones.

@siva-muni
Copy link
Contributor Author

snasovich, thanks for the review, I will address the comments

@siva-muni siva-muni force-pushed the aci-5-2-3-2-final branch from c0bae4e to 7e7eabb Compare July 4, 2022 11:23
@siva-muni
Copy link
Contributor Author

Addressed the comments, We have updated the images in the versions added by #921

  • 1.22.11-rancher1-1
  • 1.21.14-rancher1-1
  • 1.20.15-rancher2-1

@siva-muni
Copy link
Contributor Author

With these changes, testing is in-progress

snasovich
snasovich previously approved these changes Jul 5, 2022
Copy link
Collaborator

@snasovich snasovich left a comment

Choose a reason for hiding this comment

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

@siva-muni , changes LGTM, thank you for addressing my comments.

Please report the results of your testing and once you confirm it's successful and we have one more approval, this can be merged.

cc: @kinarashah

@snasovich snasovich requested a review from a team July 5, 2022 14:36
@siva-muni
Copy link
Contributor Author

snasovich, We are finished our testing, it was successful. We are not seeing any issues.

@kinarashah
Copy link
Member

@siva-muni Is there any reason we don't want the images to be updated for 1.23.x and 1.24.x? If users upgrade from 1.22.x to 1.23.x aci version would downgrade, is that expected? Apologies for missing necessary context if it's obvious.

@siva-muni
Copy link
Contributor Author

kinarashah, we added the new images now for 1.23 and 1.24 versions as well. This is an oversight from our side as we are doing this for the first time.

@snasovich
Copy link
Collaborator

@siva-muni , thank you for following up on this. Are we waiting for additional testing or good to merge once @kinarashah approves?

@siva-muni
Copy link
Contributor Author

siva-muni commented Jul 9, 2022

snasovich, We are done with testing. We are good to merge.

Copy link
Collaborator

@snasovich snasovich left a comment

Choose a reason for hiding this comment

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

@siva-muni , thank you for updating the PR and reporting that the testing is successful. LGTM.
@kinarashah , could you please take a peek at it as well and if it looks good to you, please merge it.

@a-blender a-blender self-requested a review July 11, 2022 21:45
@kinarashah kinarashah merged commit b616ed4 into rancher:dev-v2.6 Jul 11, 2022
@snasovich snasovich mentioned this pull request Sep 14, 2022
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.

3 participants