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

Upgrading to ocid 15.8.0 in Automate #8248

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Upgrading to ocid 15.8.0 in Automate #8248

merged 2 commits into from
Dec 7, 2023

Conversation

RoyShravani
Copy link
Contributor

@RoyShravani RoyShravani commented Oct 9, 2023

🔩 Description: What code changed, and why?

The oc-id component of the infra server has been upgraded to use ruby 3+ and rails 7+ in version 15.8.0. This PR aims to upgrade the bundled ocid to use 15.8.0 from 15.4.0 in the automate-cs-ocid component of chef-automate.

  1. The do_build block in ocid's plan.sh has been removed as part of this PR as intended since the tzinfo-data gem has been packaged with the new ocid bundle 15.8.0 and is not required in this block anymore.
  2. The changes in the oauth_application.rake is part of a security fix for CVE-2020-10187

⛓️ Related Resources

👍 Definition of Done

👟 How to Build and Test the Change

All the following topologies of automate and automate HA and have verified with the new ocid package and they are working as expected:

  1. Standalone installation of airgapped automate integration with supermarket.
  2. Standalone installation of non- airgapped automate integration with supermarket
  3. HA installation of airgapped automate integration with supermarket.
  4. HA installation of non-airgapped automate integration with supermarket.

✅ Checklist

All PRs must tick these:

With occasional exceptions, all PRs from Progress employees must tick these:

  • Is the code clear? (complicated code or lots of comments--subdivide and use well-named methods, meaningful variable names, etc.)
  • Consistency checked? (user notifications, user prompts, visual patterns, code patterns, variable names)
  • Repeated code blocks eliminated? (adapt and reuse existing components, blocks, functions, etc.)
  • Spelling, grammar, typos checked? (at a minimum use make spell in any component directory)
  • Code well-formatted? (indents, line breaks, etc. improve rather than hinder readability)

All PRs from Progress employees should tick these if appropriate:

  • Tests added/updated? (all new code needs new tests)
  • Docs added/updated? (all customer-facing changes)

Please add a note next to any checkbox above if you are NOT ticking it.

📷 Screenshots, if applicable

Below are the demo recordings in different topologies:

  1. non-airgapped: ocid-15.8.0-with automate-standalone-non-airgapped.mp4
  2. airgapped: ocid-15.8.0-with-automate-standalone-airgapped.mp4
  3. airgapped automate HA with ocid 15.8.0: ocid-15.8.0-with-automate-HA-airgapped.mp4
  4. non-airgapped automate HA with ocid 15.8.0: ocid-15.8.0-with-automate-HA-non-airgapped.mp4

@netlify
Copy link

netlify bot commented Oct 9, 2023

👷 Deploy Preview for chef-automate processing.

Name Link
🔨 Latest commit 5fbafa7
🔍 Latest deploy log https://app.netlify.com/sites/chef-automate/deploys/6538ccd951a5490008e3efec

@RoyShravani RoyShravani marked this pull request as draft October 25, 2023 06:59
@RoyShravani RoyShravani self-assigned this Oct 25, 2023
@RoyShravani RoyShravani force-pushed the CHEF-5916 branch 3 times, most recently from c32d1c2 to ab983bc Compare October 25, 2023 07:16
Signed-off-by: progress <[email protected]>
@sonarqube-for-infrastructure-prod

SonarQube Quality Gate

Quality Gate passed

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

No Coverage information No Coverage information
No Duplication information No Duplication information

@RoyShravani RoyShravani marked this pull request as ready for review October 27, 2023 06:53
@RoyShravani RoyShravani changed the title WIP: Upgrading to chef-server 15.8.0 in Automate Upgrading to chef-server 15.8.0 in Automate Oct 27, 2023
@RoyShravani RoyShravani changed the title Upgrading to chef-server 15.8.0 in Automate Upgrading to ocid 15.8.0 in Automate Oct 27, 2023
@karunesh-tech karunesh-tech requested review from kalroy and removed request for kalroy November 7, 2023 04:51
@RoyShravani
Copy link
Contributor Author

@jashaik @Dmaddu Could you please review and merge this PR when you have some time?

It’s been standing for a while and since the code changes and smoke testing has been completed from our end, we would like to move this ticket for PO’s review.

Copy link
Contributor

@jashaik jashaik left a comment

Choose a reason for hiding this comment

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

LGTM

@kalroy kalroy merged commit 65346bd into main Dec 7, 2023
4 checks passed
@kalroy kalroy deleted the CHEF-5916 branch December 7, 2023 09:52
swatiganesh pushed a commit that referenced this pull request Apr 16, 2024
* upgrade ocid 15.8 with automate

Signed-off-by: progress <[email protected]>

* cleanup

Signed-off-by: progress <[email protected]>

---------

Signed-off-by: progress <[email protected]>
lbakerchef added a commit that referenced this pull request Dec 17, 2024
lbakerchef added a commit that referenced this pull request Dec 19, 2024
lbakerchef added a commit that referenced this pull request Dec 19, 2024
lbakerchef added a commit that referenced this pull request Dec 19, 2024
lbakerchef added a commit that referenced this pull request Dec 20, 2024
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.

5 participants