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: upgrade base image to ubuntu:22.04 #9551

Merged
merged 2 commits into from
Jun 5, 2022

Conversation

34fathombelow
Copy link
Member

@34fathombelow 34fathombelow commented Jun 1, 2022

Signed-off-by: Justin Marquis 34fathombelow@protonmail.com

Part 2 of 3 to upgrade base image to Ubuntu:22.04
This PR upgrades base image to Ubuntu 22.04.

I do believe this will need to be cherry-picked into 2.4, the old base image will no longer recieve security updates after July 14, 2022

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

@34fathombelow
Copy link
Member Author

@jannfis @alexmt Please review this at your convenience

@codecov
Copy link

codecov bot commented Jun 1, 2022

Codecov Report

Merging #9551 (ebbe93f) into master (68c7e7d) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #9551   +/-   ##
=======================================
  Coverage   45.79%   45.79%           
=======================================
  Files         222      222           
  Lines       26377    26377           
=======================================
  Hits        12079    12079           
  Misses      12650    12650           
  Partials     1648     1648           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 68c7e7d...ebbe93f. Read the comment docs.

@crenshaw-dev crenshaw-dev changed the title Chore: upgrade base image to ubuntu:22.04 chore: upgrade base image to ubuntu:22.04 Jun 1, 2022
@crenshaw-dev crenshaw-dev added the cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch label Jun 1, 2022
@jannfis
Copy link
Member

jannfis commented Jun 1, 2022

Thanks @34fathombelow !

I really would prefer to split this up into three separate PRs and merge them in the following order:

  1. Upgrade base image of main Dockerfile
  2. The SSH related change
  3. Upgrade base image of test containers

@34fathombelow
Copy link
Member Author

Thanks @34fathombelow !

I really would prefer to split this up into three separate PRs and merge them in the following order:

1. Upgrade base image of main Dockerfile

2. The SSH related change

3. Upgrade base image of test containers

@jannfis Im fine with that, but the SSH related changes would need to be merged first. Ubuntu 22.04 now uses the libssl3 library, e2e test will not pass till this change is made first.

Signed-off-by: douhunt <douhunt@protonmail.com>
@34fathombelow
Copy link
Member Author

@jannfis Made the changes you requested. Three separate PRs ( this PR, #9561, & #9563 ) for the image base upgrade. Just a reminder #9561 will need to be merged first.

Our current Github CI is using Ubuntu 20.04 as a testing platform, that is why the e2e test are passing on this current PR. I would honestly feel much more comfortable with the runners using 22.04 even though the runners are in beta.

I ran all unit and e2e tests through the dockerized toolchain using 22.04. e2e would not complete successfully till the Kex-algorithms were updated.

Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@jannfis jannfis merged commit 8948577 into argoproj:master Jun 5, 2022
@34fathombelow 34fathombelow deleted the upgrade-ubuntu branch June 5, 2022 17:23
crenshaw-dev added a commit that referenced this pull request Jun 6, 2022
Signed-off-by: douhunt <douhunt@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Co-authored-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>
@crenshaw-dev
Copy link
Member

Cherry-picked onto 2.4.

crenshaw-dev pushed a commit to crenshaw-dev/argo-cd that referenced this pull request Jul 26, 2022
Signed-off-by: douhunt <douhunt@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Co-authored-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore: update Kex-Algorithms (argoproj#9561)

* chore: update Kex-Algorithms

Signed-off-by: douhunt <douhunt@protonmail.com>

* sorted kex-algorithms

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore upgrade base image for test containers Ubuntu:22.04 (argoproj#9563)

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>
crenshaw-dev pushed a commit to crenshaw-dev/argo-cd that referenced this pull request Jul 26, 2022
Signed-off-by: douhunt <douhunt@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Co-authored-by: Michael Crenshaw <michael@crenshaw.dev>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore: update Kex-Algorithms (argoproj#9561)

* chore: update Kex-Algorithms

Signed-off-by: douhunt <douhunt@protonmail.com>

* sorted kex-algorithms

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>

Co-authored-by: douhunt <douhunt@protonmail.com>
Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

chore upgrade base image for test containers Ubuntu:22.04 (argoproj#9563)

Signed-off-by: 34FathomBelow <34fathombelow@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants