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

[release-4.13] OCPBUGS-8525: Wait for soakSeconds after policy becomes compliant before moving on from policy #496

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #481

/assign jc-rh

If a policy has the `soakSeconds` annotation, the controller will wait for the specified
number of seconds after the first time it observes that the cluster is compliant with
that policy before moving on from that policy. The controller will set
`status.status.currentBatchRemediationProgress.clusterName.firstCompliantAt` the first time
it observes that the cluster is compliant with the policy. In the following reconciliations,
if the requested number of seconds has passed since firstCompliantAt, and the cluster remains
compliant with the policy, the controller will move on from that policy.

Signed-off-by: Saeid Askari <saskari@redhat.com>
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-7540 has been cloned as Jira Issue OCPBUGS-8525. Will retitle bug to link to clone.
/retitle [release-4.13] OCPBUGS-8525: Wait for soakSeconds after policy becomes compliant before moving on from policy

In response to this:

This is an automated cherry-pick of #481

/assign jc-rh

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.

@openshift-ci openshift-ci bot changed the title [release-4.13] OCPBUGS-7540: Wait for soakSeconds after policy becomes compliant before moving on from policy [release-4.13] OCPBUGS-8525: Wait for soakSeconds after policy becomes compliant before moving on from policy Mar 7, 2023
@openshift-ci
Copy link

openshift-ci bot commented Mar 7, 2023

@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.13] OCPBUGS-8525: Wait for soakSeconds after policy becomes compliant before moving on from policy

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.

@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-8525, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-7540 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-7540 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @yliu127

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #481

/assign jc-rh

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.

@openshift-ci
Copy link

openshift-ci bot commented Mar 7, 2023

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: yliu127.

Note that only openshift-kni members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-8525, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-7540 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-7540 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @yliu127

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #481

/assign jc-rh

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.

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.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 7, 2023
@openshift-ci
Copy link

openshift-ci bot commented Mar 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jc-rh

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 7, 2023
@openshift-merge-robot openshift-merge-robot merged commit 86dd218 into openshift-kni:release-4.13 Mar 7, 2023
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-8525: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-8525 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #481

/assign jc-rh

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.

@jc-rh
Copy link
Member

jc-rh commented Mar 7, 2023

/cherrypick release-4.12

@openshift-cherrypick-robot
Copy link
Author

@jc-rh: #496 failed to apply on top of branch "release-4.12":

Applying: Add ability to wait for `soak duration` after policy becomes compliant
.git/rebase-apply/patch:526: trailing whitespace.
    cluster-group-upgrades-operator/name-suffix: kuttl      
.git/rebase-apply/patch:603: trailing whitespace.
  - command: oc delete -f ../../../../deploy/acm/managed-clusters/setup-managed-spoke-clusters.yaml 
.git/rebase-apply/patch:605: trailing whitespace.
  - command: oc apply -f ../../../../deploy/acm/managed-clusters/setup-managed-spoke-clusters.yaml 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	api/v1alpha1/clustergroupupgrade_types.go
M	api/v1alpha1/zz_generated.deepcopy.go
M	bundle/manifests/ran.openshift.io_clustergroupupgrades.yaml
M	config/crd/bases/ran.openshift.io_clustergroupupgrades.yaml
M	controllers/clustergroupupgrade_controller.go
M	controllers/utils/constants.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/utils/constants.go
CONFLICT (content): Merge conflict in controllers/utils/constants.go
Auto-merging controllers/clustergroupupgrade_controller.go
Auto-merging config/crd/bases/ran.openshift.io_clustergroupupgrades.yaml
Auto-merging bundle/manifests/ran.openshift.io_clustergroupupgrades.yaml
Auto-merging api/v1alpha1/zz_generated.deepcopy.go
Auto-merging api/v1alpha1/clustergroupupgrade_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add ability to wait for `soak duration` after policy becomes compliant
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:

/cherrypick release-4.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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants