gitops-2415 added reconcile plugin condition

[ciiay]

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.

[jaideepr97]

Hi @ciiay @keithchong
Are we still going with the approach of making the dynamic plugin optionally enabled (but disabled by default) under 4.15?
In this PR it seems like the plugin will not work for clusters under 4.15 at all

[ciiay]

Hi @ciiay @keithchong Are we still going with the approach of making the dynamic plugin optionally enabled (but disabled by default) under 4.15? In this PR it seems like the plugin will not work for clusters under 4.15 at all

Hi Jaideep, thanks for the review. Yes, going forward we will only reconcile dynamic plugin resources when OCP is 4.15 or higher version. On OCP 4.14 or lower, user will still be able to use static plugin. Please refer to the GITOPS-2415 and Keith's comment in GITOPS-2369

[ciiay]

/test v4.10-e2e

[jaideepr97]

Hi @ciiay @keithchong Are we still going with the approach of making the dynamic plugin optionally enabled (but disabled by default) under 4.15? In this PR it seems like the plugin will not work for clusters under 4.15 at all

Hi Jaideep, thanks for the review. Yes, going forward we will only reconcile dynamic plugin resources when OCP is 4.15 or higher version. On OCP 4.14 or lower, user will still be able to use static plugin. Please refer to the GITOPS-2415 and Keith's comment in GITOPS-2369

@ciiay according to that comment we will disable it by default, but users should have the option to enable it - and we should document that enabling the dynamic plugin means there will be 2 environment tabs rendered in the console

This will require changes in the CRD to add a new field to enable/disable teh dynamic plugin, and the operator would need to be able to reconcile the plugin based on that setting in the CR

[ciiay]

@ciiay according to that comment we will disable it by default, but users should have the option to enable it - and we should document that enabling the dynamic plugin means there will be 2 environment tabs rendered in the console

This will require changes in the CRD to add a new field to enable/disable teh dynamic plugin, and the operator would need to be able to reconcile the plugin based on that setting in the CR

For now the SDK is not supporting to set Console Plugin default to Enable, so we have to only reconcile it once the static plugin gets removed on OCP 4.15.

Where else to document the 2 environment buttons rendered in the console besides GITOPS-2369 and GITOPS-2415?

[jaideepr97]

@ciiay according to that comment we will disable it by default, but users should have the option to enable it - and we should document that enabling the dynamic plugin means there will be 2 environment tabs rendered in the console

This will require changes in the CRD to add a new field to enable/disable teh dynamic plugin, and the operator would need to be able to reconcile the plugin based on that setting in the CR

For now the SDK is not supporting to set Console Plugin default to Enable, so we have to only reconcile it once the static plugin gets removed on OCP 4.15.

Where else to document the 2 environment buttons rendered in the console besides GITOPS-2369 and GITOPS-2415?

I'm not talking about enabling by default...I'm saying last I knew we were going to keep it disabled by default for < 4.15 but were still going to support enabling the dynamic plugin via the CR on OCP < 4.15 if the user explicitly wished to do so
I'm just wondering if that has changed

[ciiay]

@ciiay according to that comment we will disable it by default, but users should have the option to enable it - and we should document that enabling the dynamic plugin means there will be 2 environment tabs rendered in the console
This will require changes in the CRD to add a new field to enable/disable teh dynamic plugin, and the operator would need to be able to reconcile the plugin based on that setting in the CR

For now the SDK is not supporting to set Console Plugin default to Enable, so we have to only reconcile it once the static plugin gets removed on OCP 4.15.
Where else to document the 2 environment buttons rendered in the console besides GITOPS-2369 and GITOPS-2415?

I'm not talking about enabling by default...I'm saying last I knew we were going to keep it disabled by default for < 4.15 but were still going to support enabling the dynamic plugin via the CR on OCP < 4.15 if the user explicitly wished to do so I'm just wondering if that has changed

There are two definition of Enable.

1. Creating resources for dynamic plugin -> this has to happen only when static plugin gets removed which is planned on OCP 4.15
2. Enable in Console Plugin section on gitops-operator installation page -> this will be available as long as dynamic plugin resources are created

We want to keep only one “Environments” button, so to avoid two buttons showing up, we only create dynamic plugins when static plugin is no longer there

[jaideepr97]

@ciiay is this required here?

[ciiay]

@jaideepr97 Yes, it's needed, because I’m checking the OCP version in Reconcile function, if I don’t set it in the unit tests, it will through error and unit tests will fail. Or is there a better way to solve the problem?

[jaideepr97]

please see https://github.com/redhat-developer/gitops-operator/pull/398/files#r1029254556

[jaideepr97]

is this required here?

[ciiay]

Same as the previous one, if I don't set it here the unit test fails.

[jaideepr97]

https://github.com/redhat-developer/gitops-operator/pull/398/files#r1029254556

[iam-veeramalla]

@ciiay @jaideepr97 @keithchong
Is there a way to use the new dynamic plugin on OCP 4.12 ? If yes, how ?

The below logic added in the PR seems to ignore the creation of plugin resources if OCP version < 4.15, Am I missing something ?

	v2, err := version.NewVersion("4.15.0")
	if v1.LessThan(v2) {
		return reconcile.Result{}, err
	} else {
		return r.reconcilePlugin(instance, request)
	}

[jaideepr97]

@ciiay @jaideepr97 @keithchong
Is there a way to use the new dynamic plugin on OCP 4.12 ? If yes, how ?

The below logic added in the PR seems to ignore the creation of plugin resources if OCP version < 4.15, Am I missing something ?

v2, err := version.NewVersion("4.15.0")
if v1.LessThan(v2) {
return reconcile.Result{}, err
} else {
return r.reconcilePlugin(instance, request)
}

@iam-veeramalla that is what i have asked above, it seems the decision is to only allow creation of dynamic plugin resources starting 4.15 (not even provide the option to enable it by the user)

so im actually not sure how anyone would be able to test this until we have a 4.15 cluster

cc @ciiay @keithchong

[jaideepr97]

@ciiay I don't think we need to return an error here, we can just have

if !v1.LessThan(v2) {
     r.reconcilePlugin(instnace, request)
    }

[jaideepr97]

@ciiay Please add sign-offs to all commits so the DCO check passes

[openshift-ci]

[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 assign jopit for approval by writing /assign @jopit in a comment. For more information see the Kubernetes Code Review Process.

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

Details

Needs approval from an approver in each of these files:

• OWNERS

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

[openshift-ci]

[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 assign jopit for approval by writing /assign @jopit in a comment. For more information see the Kubernetes Code Review Process.

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

Details

Needs approval from an approver in each of these files:

• OWNERS

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

[openshift-ci]

@ciiay: 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.8-e2e	0a35916	link	true	/test v4.8-e2e
ci/prow/v4.10-e2e	0a35916	link	true	/test v4.10-e2e

Full PR test history. Your PR dashboard.

Details

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.

[ciiay]

New PR created #402. Closing this PR due to rebase and sign off issue.