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

Removed duplicate CRD entry for ArgoCD, updated missing details for operator owned crds #678

Merged
merged 2 commits into from
Apr 28, 2024

Conversation

anandf
Copy link
Member

@anandf anandf commented Apr 23, 2024

What type of PR is this?

Uncomment only one /kind line, and delete the rest.
For example, > /kind bug would simply become: /kind bug

/kind bug

What does this PR do / why we need it:

Have you updated the necessary documentation?

  • Documentation update is required by this PR.
  • Documentation has been updated.

Which issue(s) this PR fixes:

Fixes https://issues.redhat.com/browse/GITOPS-4513

Test acceptance criteria:

  • Unit Test
  • E2E Test

How to test changes / Special notes to the reviewer:

…Name for missing operator owned crds

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>
Copy link

openshift-ci bot commented Apr 23, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from anandf. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

Copy link
Member

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

@anandf - I think we also need to update config/manifests/bases/gitops-operator.clusterserviceversion.yaml. Code-gen will override bundle changes if they are not part of config/ directory.

Signed-off-by: Anand Francis Joseph <anjoseph@redhat.com>
Copy link

openshift-ci bot commented Apr 24, 2024

@anandf: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/v4.12-e2e 52cb364 link true /test v4.12-e2e
ci/prow/v4.13-e2e 52cb364 link true /test v4.13-e2e
ci/prow/v4.12-kuttl-sequential 52cb364 link true /test v4.12-kuttl-sequential
ci/prow/v4.12-kuttl-parallel 52cb364 link true /test v4.12-kuttl-parallel
ci/prow/v4.14-kuttl-sequential 52cb364 link true /test v4.14-kuttl-sequential
ci/prow/v4.14-kuttl-parallel 52cb364 link true /test v4.14-kuttl-parallel
ci/prow/v4.14-e2e 52cb364 link true /test v4.14-e2e
ci/prow/v4.13-kuttl-sequential 52cb364 link true /test v4.13-kuttl-sequential
ci/prow/v4.13-kuttl-parallel 52cb364 link true /test v4.13-kuttl-parallel

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link
Member

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

/lgtm

Tested out the changes. The ArgoCD CR is now visible in OCP developer console.

@svghadi
Copy link
Member

svghadi commented Apr 26, 2024

/cherry-pick v1.12

@openshift-cherrypick-robot

@svghadi: once the present PR merges, I will cherry-pick it on top of v1.12 in a new PR and assign it to you.

In response to this:

/cherry-pick v1.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@iam-veeramalla iam-veeramalla merged commit 17bdd07 into redhat-developer:master Apr 28, 2024
8 of 18 checks passed
@openshift-cherrypick-robot

@svghadi: new pull request created: #682

In response to this:

/cherry-pick v1.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@anandf
Copy link
Member Author

anandf commented Apr 30, 2024

/cherry-pick v1.11

@openshift-cherrypick-robot

@anandf: only redhat-developer org members may request cherry picks. If you are already part of the org, make sure to change your membership to public. Otherwise you can still do the cherry-pick manually.

In response to this:

/cherry-pick v1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@anandf
Copy link
Member Author

anandf commented Apr 30, 2024

/cherry-pick v1.11
/cherry-pick v1.10

@openshift-cherrypick-robot

@anandf: #678 failed to apply on top of branch "v1.11":

Applying: Removed duplicate CRD entry for ArgoCD, added description and displayName for missing operator owned crds
Using index info to reconstruct a base tree...
M	bundle/manifests/gitops-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/manifests/gitops-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/gitops-operator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Removed duplicate CRD entry for ArgoCD, added description and displayName for missing operator owned crds
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick v1.11
/cherry-pick v1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

trdoyle81 pushed a commit to trdoyle81/gitops-operator that referenced this pull request Aug 13, 2024
…_csv

Removed duplicate CRD entry for ArgoCD, updated missing details for operator owned crds
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.

4 participants