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-25847: add argocd types #1991

Merged
merged 9 commits into from
Aug 20, 2024
Merged

ROX-25847: add argocd types #1991

merged 9 commits into from
Aug 20, 2024

Conversation

ludydoo
Copy link
Collaborator

@ludydoo ludydoo commented Aug 19, 2024

Description

  • Adding ArgoCD types for use with ctrlClient
  • Not pulling the ArgoCD repository, because of potential dependency conflicts with Stackrox import
  • Just copy-pasting the types from the ArgoCD repository

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
  • (If applicable) Changes to the dp-terraform Helm values have been reflected in the addon on integration environment

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup
make verify lint binary test test/integration

@@ -0,0 +1,4 @@
These types were copy-pasted from https://github.com/argoproj/argo-cd/tree/master/pkg/apis/application/v1alpha1

We are not importing the ArgoCD dependency itself, because it would significantly
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you try to add it as a Go dependency first and decided along the way that it wasn't worth the effort because of actual complexity in go.mod and conflicts with stackrox or is this a hypothesis that might never become true?

Asking because I'd honestly rather have a more complex go.mod as opposed to having to maintain this kind of implicit dependency over the lifetime of this product and possibly a lot of different ArgoCD versions in the long run.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I initially tried that, and got some errors. But I suspect a brain fart on my part. It's working well now by importing the repo directly, after updating the go.mod toolchain

go.mod Outdated Show resolved Hide resolved
@johannes94 johannes94 self-assigned this Aug 20, 2024
@ludydoo ludydoo requested a review from johannes94 August 20, 2024 08:52
@ludydoo
Copy link
Collaborator Author

ludydoo commented Aug 20, 2024

/retest

@openshift-ci openshift-ci bot added the lgtm label Aug 20, 2024
Copy link
Contributor

openshift-ci bot commented Aug 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johannes94, ludydoo

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:

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

@ludydoo
Copy link
Collaborator Author

ludydoo commented Aug 20, 2024

/retest

2 similar comments
@ludydoo
Copy link
Collaborator Author

ludydoo commented Aug 20, 2024

/retest

@ludydoo
Copy link
Collaborator Author

ludydoo commented Aug 20, 2024

/retest

@ludydoo
Copy link
Collaborator Author

ludydoo commented Aug 20, 2024

/retest

2 similar comments
@ludydoo
Copy link
Collaborator Author

ludydoo commented Aug 20, 2024

/retest

@ludydoo
Copy link
Collaborator Author

ludydoo commented Aug 20, 2024

/retest

@ludydoo ludydoo merged commit 808b4c2 into main Aug 20, 2024
6 checks passed
@ludydoo ludydoo deleted the ROX-25847-add-argocd-types branch August 20, 2024 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants