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

feat: Upgrade ArgoCD CRD to v1beta1 & add conversion webhook support #594

Merged
merged 6 commits into from
Sep 11, 2023

Conversation

svghadi
Copy link
Member

@svghadi svghadi commented Sep 6, 2023

What type of PR is this?
/kind enhancement

What does this PR do / why we need it:
This PR bring argoproj-labs/argocd-operator#964 into gitops-operator.

Changes:

  • Add ArgoCD v1beta1 CRD
  • Update all ArgoCD v1alpha1 references to v1beta1 in codebase (excluding kuttl tests)
  • Configure conversion webhook server to run on 9443 port in operator-controller-manager deployment.
  • Use server side validation for "kubectl apply" as client side apply results into failure due to exceeding annotation size limit.
  • Add kuttl e2e tests

How certs are handled for webhook?:
When operator is installed via OLM, the OLM takes care of cert generation and injection into operator manager pod.
For non-olm install, cert management is off-loaded to Openshift Service CA operator. The required annotations for this are already added in configs so no user action is required, however user needs to explicitly set env var ENABLE_CONVERSION_WEBHOOK to "true" in operator manager deployment to enable the webhook.

Have you updated the necessary documentation?

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

Which issue(s) this PR fixes:
GITOPS-3040

How to test changes / Special notes to the reviewer:
Test instruction same as argoproj-labs/argocd-operator#964.

Automated test : kubectl kuttl test ./test/openshift/e2e/parallel/ --config ./test/openshift/e2e/parallel/kuttl-test.yaml --test 1-103_argocd_alpha_to_beta_conversion

@svghadi
Copy link
Member Author

svghadi commented Sep 6, 2023

CI jobs are failing with

time="2023-09-06T05:39:02Z" level=info msg="Generated a valid File-Based Catalog"
time="2023-09-06T05:39:02Z" level=fatal msg="Failed to run bundle: create catalog: error creating registry pod: error building registry pod definition: configMap error: error updating ConfigMap: error creating ConfigMap: ConfigMap "gitops-operator-catalog-configmap-partition-2" is invalid: []: Too long: must have at most 1048576 bytes\n"

Looks like it is due to operator-framework/operator-sdk#6323

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
@svghadi
Copy link
Member Author

svghadi commented Sep 11, 2023

/retest

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
@iam-veeramalla
Copy link
Collaborator

/lgtm
/approve

@openshift-ci openshift-ci bot removed the lgtm label Sep 11, 2023
@iam-veeramalla
Copy link
Collaborator

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label Sep 11, 2023
@svghadi
Copy link
Member Author

svghadi commented Sep 11, 2023

/test all

@svghadi
Copy link
Member Author

svghadi commented Sep 11, 2023

/retest

1 similar comment
@svghadi
Copy link
Member Author

svghadi commented Sep 11, 2023

/retest

@openshift-ci
Copy link

openshift-ci bot commented Sep 11, 2023

@svghadi: 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.14-kuttl-parallel 8c83062 link true /test v4.14-kuttl-parallel
ci/prow/v4.14-kuttl-sequential 8c83062 link true /test v4.14-kuttl-sequential

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.

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
@openshift-ci openshift-ci bot removed the lgtm label Sep 11, 2023
@iam-veeramalla
Copy link
Collaborator

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label Sep 11, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iam-veeramalla

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

@openshift-merge-robot openshift-merge-robot merged commit 9f7824a into redhat-developer:master Sep 11, 2023
1 check passed
@svghadi svghadi deleted the v1beta1 branch September 12, 2023 03:45
trdoyle81 pushed a commit to trdoyle81/gitops-operator that referenced this pull request Aug 13, 2024
…edhat-developer#594)

* Upgrade ArgoCD CRD to v1beta1 & add conversion webhook support

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Fix olm manifests generation

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Fix olm cert generation

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Fix rhsso test failure by updating test configs for new rhsso version

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* run code-gen make targets

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Co-authored-by: Abhishek Veeramalla <abhishek.veeramalla@gmail.com>
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