Skip to content

GITOPS-2415 Add reconcile plugin condition#402

Merged
openshift-merge-robot merged 1 commit into
redhat-developer:masterfrom
ciiay:gitops-2415-add-reconcile-plugin-condition-new
Nov 23, 2022
Merged

GITOPS-2415 Add reconcile plugin condition#402
openshift-merge-robot merged 1 commit into
redhat-developer:masterfrom
ciiay:gitops-2415-add-reconcile-plugin-condition-new

Conversation

@ciiay
Copy link
Copy Markdown
Member

@ciiay ciiay commented Nov 22, 2022

What type of PR is this?

/kind enhancement

What does this PR do / why we need it:
To avoid multiple "Environments" button showing up in left menu on Developer tab in DevConsole.

Have you updated the necessary documentation?

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

Which issue(s) this PR fixes:

Fixes GITOPS-2415

Test acceptance criteria:

  • Unit Test
  • E2E Test

How to test changes / Special notes to the reviewer:

  1. On OCP 4.15 or greater, observe that Console Plugin section is showing up on GitOps-operator installation page. Only one "Environments" button exists on Developer tab left menu.
  2. On OCP 4.14 or lower, observe that Console Plugin section is not showing up on GitOps-operator installation page. Only one "Environments" button exists on Developer tab left menu.

Signed-off-by: Yi Cai <yicai@redhat.com>
@ciiay ciiay requested a review from iam-veeramalla November 22, 2022 22:09
@openshift-ci openshift-ci Bot added the kind/enhancement New feature or request label Nov 22, 2022
@openshift-ci openshift-ci Bot requested a review from sbose78 November 22, 2022 22:09
@ciiay ciiay requested review from jaideepr97, jopit, keithchong and wtam2018 and removed request for sbose78 November 22, 2022 22:09
@ciiay ciiay requested a review from jannfis November 22, 2022 22:13
Copy link
Copy Markdown
Contributor

@iam-veeramalla iam-veeramalla left a comment

Choose a reason for hiding this comment

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

Approving the change as the changes suggested in the review comments are trivial

insecureEnvVarValue = "true"
serviceNamespace = "openshift-gitops"
deprecatedServiceNamespace = "openshift-pipelines-app-delivery"
dynamicPluginStartOCPVersionEnv = "DYNAMIC_PLUGIN_START_OCP_VERSION"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This declaration does not seem to be required.

}

return r.reconcilePlugin(instance, request)
dynamicPluginStartOCPVersion := os.Getenv(dynamicPluginStartOCPVersionEnv)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we directly use DYNAMIC_PLUGIN_START_OCP_VERSION here ?

dynamicPluginStartOCPVersion := os.Getenv(DYNAMIC_PLUGIN_START_OCP_VERSION)

@iam-veeramalla
Copy link
Copy Markdown
Contributor

/lgtm
/approve

Thanks @ciiay

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Nov 23, 2022

[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

Details 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 c85dde6 into redhat-developer:master Nov 23, 2022
iam-veeramalla added a commit that referenced this pull request Nov 23, 2022
…ugin

[cherry-pick]: Add reconcile plugin condition (#402)
@ciiay ciiay changed the title Add reconcile plugin condition GITOPS-2415 Add reconcile plugin condition Nov 23, 2022
varshab1210 pushed a commit to varshab1210/gitops-operator that referenced this pull request Dec 7, 2022
Signed-off-by: Yi Cai <yicai@redhat.com>

Signed-off-by: Yi Cai <yicai@redhat.com>
Signed-off-by: varshab1210 <vab@redhat.com>
openshift-merge-robot pushed a commit that referenced this pull request Dec 8, 2022
* Skip test based on condition

Signed-off-by: varshab1210 <vab@redhat.com>

* chore: pick up latest argocd-operator commit

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: varshab1210 <vab@redhat.com>

* Add reconcile plugin condition (#402)

Signed-off-by: Yi Cai <yicai@redhat.com>

Signed-off-by: Yi Cai <yicai@redhat.com>
Signed-off-by: varshab1210 <vab@redhat.com>

* increase timeout and skip condition

Signed-off-by: varshab1210 <vab@redhat.com>

* Removing additional variable

Signed-off-by: varshab1210 <vab@redhat.com>

* lowering timeout

Signed-off-by: varshab1210 <vab@redhat.com>

* Enable test

Signed-off-by: varshab1210 <vab@redhat.com>

Signed-off-by: varshab1210 <vab@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Yi Cai <yicai@redhat.com>
Co-authored-by: ishitasequeira <ishiseq29@gmail.com>
Co-authored-by: Yi Cai <yicai@redhat.com>
trdoyle81 pushed a commit to trdoyle81/gitops-operator that referenced this pull request Aug 13, 2024
Signed-off-by: Yi Cai <yicai@redhat.com>

Signed-off-by: Yi Cai <yicai@redhat.com>
trdoyle81 pushed a commit to trdoyle81/gitops-operator that referenced this pull request Aug 13, 2024
…r#401)

* Skip test based on condition

Signed-off-by: varshab1210 <vab@redhat.com>

* chore: pick up latest argocd-operator commit

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: varshab1210 <vab@redhat.com>

* Add reconcile plugin condition (redhat-developer#402)

Signed-off-by: Yi Cai <yicai@redhat.com>

Signed-off-by: Yi Cai <yicai@redhat.com>
Signed-off-by: varshab1210 <vab@redhat.com>

* increase timeout and skip condition

Signed-off-by: varshab1210 <vab@redhat.com>

* Removing additional variable

Signed-off-by: varshab1210 <vab@redhat.com>

* lowering timeout

Signed-off-by: varshab1210 <vab@redhat.com>

* Enable test

Signed-off-by: varshab1210 <vab@redhat.com>

Signed-off-by: varshab1210 <vab@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Yi Cai <yicai@redhat.com>
Co-authored-by: ishitasequeira <ishiseq29@gmail.com>
Co-authored-by: Yi Cai <yicai@redhat.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