Skip to content

Allow users to add annotation to set configure rollback - #6546

Merged
OchiengEd merged 5 commits into
operator-framework:masterfrom
OchiengEd:configurable-rollback
Sep 11, 2023
Merged

OchiengEd merged 5 commits into
operator-framework:masterfrom
OchiengEd:configurable-rollback

Conversation

@OchiengEd

Copy link
Copy Markdown
Contributor

Description of the change:

Whenever a helm-based operator encounters an error during reconcilliation, by default, it would attempt to perform a rollback with the --force option. While this works as expected in most scenarios, there are a few edge cases where performing a rollback with --force could have undesired side effects.

Adding annotation to the custom resource, helm.sdk.operatorframework.io/rollback-force: false therefore allows a user, to change the default behavior of the helm-based operator whereby, rollbacks will be performed without the --force option whenever an error is encountered.%

Motivation for the change:

This change was motivated by the issue #6494

Checklist

If the pull request includes user-facing changes, extra documentation is required:

Closes #6494

Allow users to add annotation, "helm.sdk.operatorframework.io/rollback-force", to set rollback
to false. Default value is true

Signed-off-by: Edmund Ochieng <ochienged@gmail.com>
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 15:29 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 15:29 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 15:29 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 15:29 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 15:29 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 15:29 — with GitHub Actions Inactive
Signed-off-by: Edmund Ochieng <ochienged@gmail.com>
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 18:21 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 18:21 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 18:21 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 18:21 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 18:21 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 15, 2023 18:21 — with GitHub Actions Inactive

@everettraven everettraven left a comment

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.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 15, 2023
Comment thread internal/helm/controller/reconcile.go Resolved
Comment thread internal/helm/release/manager.go Resolved
Comment thread internal/helm/controller/reconcile.go Resolved
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 17, 2023
@OchiengEd
OchiengEd temporarily deployed to deploy August 17, 2023 16:18 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 17, 2023 16:18 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 17, 2023 16:18 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 17, 2023 16:18 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 17, 2023 16:18 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy August 17, 2023 16:18 — with GitHub Actions Inactive
…-force annotation

Signed-off-by: Edmund Ochieng <ochienged@gmail.com>
@OchiengEd
OchiengEd force-pushed the configurable-rollback branch from de5931b to 6bbe031 Compare August 17, 2023 16:56
@OchiengEd
OchiengEd temporarily deployed to deploy August 17, 2023 16:57 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 17:37 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:32 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:32 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:32 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:32 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:32 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:32 — with GitHub Actions Inactive
@OchiengEd
OchiengEd force-pushed the configurable-rollback branch from c549cbb to d16d463 Compare September 11, 2023 18:52
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:53 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:53 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:53 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:53 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:53 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:53 — with GitHub Actions Inactive
Signed-off-by: Edmund Ochieng <ochienged@gmail.com>
@OchiengEd
OchiengEd force-pushed the configurable-rollback branch from d16d463 to 8321420 Compare September 11, 2023 18:54
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:57 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 18:57 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 19:00 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 19:00 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 19:01 — with GitHub Actions Inactive
@OchiengEd
OchiengEd temporarily deployed to deploy September 11, 2023 19:01 — with GitHub Actions Inactive

@varshaprasad96 varshaprasad96 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2023
@OchiengEd OchiengEd modified the milestone: v1.32.0 Sep 11, 2023
@OchiengEd
OchiengEd merged commit 8ceb4e0 into operator-framework:master Sep 11, 2023
@OchiengEd
OchiengEd deleted the configurable-rollback branch September 11, 2023 20:12

This branch was previously deployed

1 inactive deployment
deploy — 83214205 Deployed Sep 11, 2023 by OchiengEd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Helm operator constantly creates secret for a failed Operand upgrade

3 participants