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

remove the init container that decides the allowing of reconciliation of manager #301

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

rewantsoni
Copy link
Member

With convergence, the ocs-operator will always deploy the ocs-client-op, thus we no longer need the deployment guard.

This PR removes the deployment-guard init container

the ocs-operator will always come up with the ocs-client op,
the deployment guard was added to stop the client-op from
coming up, hence removing it

Signed-off-by: Rewant Soni <[email protected]>
@rewantsoni
Copy link
Member Author

/hold for testing

@leelavg
Copy link
Contributor

leelavg commented Feb 10, 2025

did you try reverting commits from these PRs in reverse order? #196, #198, #208, the expectation after revert should be a clean branch w/ no merge conflicts.

@rewantsoni
Copy link
Member Author

I didn't try a revert because of https://github.com/red-hat-storage/ocs-client-operator/pull/196/files#diff-5fc35123fcf790367bb280d63e74ddb015a7393edde91df0ebb77eb7e9f90f18L10, we are updating the operator-sdk version and kubebuilder version

@leelavg
Copy link
Contributor

leelavg commented Feb 10, 2025

ack, then you can add a commit to explicitly fix them/those, anyways pls choose whatever works for you.

@leelavg
Copy link
Contributor

leelavg commented Feb 11, 2025

@rewantsoni what's pending on this?

@rewantsoni
Copy link
Member Author

@leelavg I could not test as I was busy due to 4.18 RC. I will test it today and update

@rewantsoni
Copy link
Member Author

Testing:

Ran make deploy to install the operator
[rewantsoni work] k get po -n ocs-client-operator-system ocs-client-operator-controller-manager-df596664c-4jkbk -o json | jq '.spec.containers[].name'
"kube-rbac-proxy"
"manager"

The deployment-guard controller no longer exists

@rewantsoni rewantsoni requested a review from leelavg February 12, 2025 06:30
Copy link
Contributor

@leelavg leelavg left a comment

Choose a reason for hiding this comment

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

/hold if more votes are required.
after merge to 4.19 we need to update d/s Dockerfile.

Copy link

openshift-ci bot commented Feb 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leelavg, rewantsoni

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

Copy link
Member

@Madhu-1 Madhu-1 left a comment

Choose a reason for hiding this comment

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

We can merge this change once a disable Rook csi deployment in ocs-operator or in Rook CSV irrespective of modes

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.

3 participants