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

ROX-21070: Implement the addon mgmt in fleet manager #1522

Merged
merged 4 commits into from
Jan 11, 2024

Conversation

kovayur
Copy link
Contributor

@kovayur kovayur commented Dec 8, 2023

Description

Install addon from Fleet Manager: Part 4.
This change adds a feature to automatically update addons from Fleet Manager.

Checklist (Definition of Done)

  • Unit and integration tests added
  • Added test description under Test manual
  • Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
  • CI and all relevant tests are passing
  • Add the ticket number to the PR title if available, i.e. ROX-12345: ...
  • Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.
  • Add secret to app-interface Vault or Secrets Manager if necessary
  • RDS changes were e2e tested manually
  • Check AWS limits are reasonable for changes provisioning new resources

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup OCM_OFFLINE_TOKEN=<ocm-offline-token> OCM_ENV=development
make verify lint binary test test/integration

Copy link
Contributor

openshift-ci bot commented Dec 8, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved label Dec 8, 2023
@kovayur kovayur force-pushed the yury/addon-cicd-03-gitops branch from 65db6ca to b073eda Compare December 15, 2023 09:22
@kovayur kovayur force-pushed the yury/addon-cicd-04-fleet-manager-mgmt branch from 701d573 to 5677063 Compare December 15, 2023 09:23
@kovayur kovayur marked this pull request as ready for review December 15, 2023 09:23
@kovayur kovayur force-pushed the yury/addon-cicd-03-gitops branch from b073eda to 23c5cbf Compare December 19, 2023 10:11
@kovayur kovayur requested a review from johannes94 as a code owner December 19, 2023 10:11
Base automatically changed from yury/addon-cicd-03-gitops to main December 20, 2023 15:27
if addonErr != nil {
if addonErr.Is404() {
// addon does not exist, install it
multiErr = multierror.Append(multiErr, p.installAddon(clusterID, addon))
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not familiar with multierror, but should this read?

if err := p.installAddon(clusterID, addon)); err != nil {
  multiErr = multierror.Append(multiErr, err)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, in my case when err is nil there'll be no action. I fixed the logging a bit to support the error case

Copy link
Collaborator

@ludydoo ludydoo left a comment

Choose a reason for hiding this comment

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

Spotless! 💯

@openshift-ci openshift-ci bot added the lgtm label Jan 3, 2024
@kovayur kovayur force-pushed the yury/addon-cicd-04-fleet-manager-mgmt branch from 82a0c50 to dc46791 Compare January 8, 2024 16:56
@openshift-ci openshift-ci bot removed the lgtm label Jan 8, 2024
Copy link
Contributor

openshift-ci bot commented Jan 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kovayur, ludydoo, SimonBaeumer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [SimonBaeumer,kovayur,ludydoo]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kovayur kovayur force-pushed the yury/addon-cicd-04-fleet-manager-mgmt branch from dc46791 to cfa9be2 Compare January 10, 2024 15:51
@openshift-ci openshift-ci bot removed the lgtm label Jan 10, 2024
Copy link
Contributor

openshift-ci bot commented Jan 10, 2024

New changes are detected. LGTM label has been removed.

@kovayur kovayur merged commit 5c06671 into main Jan 11, 2024
9 checks passed
@kovayur kovayur deleted the yury/addon-cicd-04-fleet-manager-mgmt branch January 11, 2024 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants