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

fix: ensure Annotations and Labels are available #3434

Merged
merged 3 commits into from
Nov 30, 2023

Conversation

YanniHu1996
Copy link
Contributor

@YanniHu1996 YanniHu1996 commented Nov 30, 2023

closes: #3435

@github-actions github-actions bot added backport-requested ◀️ This pull request should be backported to all supported releases release-1.20 release-1.21 labels Nov 30, 2023
Copy link
Contributor

❗ By default, the pull request is configured to backport to all release branches.

  • To stop backporting this pr, remove the label: backport-requested ◀️ or add the label 'do not backport'
  • To stop backporting this pr to a certain release branch, remove the specific branch label: release-x.y

Signed-off-by: YanniHu1996 <yantian.hu@enterprisedb.com>
Signed-off-by: Tao Li <tao.li@enterprisedb.com>
@litaocdl
Copy link
Collaborator

/test limit=local

Copy link
Contributor

@litaocdl, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/7043401066

Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
@leonardoce
Copy link
Contributor

/ok-to-merge

@leonardoce leonardoce added the ok to merge 👌 This PR can be merged label Nov 30, 2023
@leonardoce leonardoce merged commit 86120ae into cloudnative-pg:main Nov 30, 2023
25 of 27 checks passed
@leonardoce leonardoce deleted the dev/cnp-4367 branch November 30, 2023 09:00
cnpg-bot pushed a commit that referenced this pull request Nov 30, 2023
Old versions of CNPG did not set any label or annotation on
PodDisruptionBudgets.
When upgrading to a newer version of CNPG, the metadata
reconciliation of those PDBs failed, and this patch makes it
working.

Closes: #3435

Signed-off-by: YanniHu1996 <yantian.hu@enterprisedb.com>
Signed-off-by: Tao Li <tao.li@enterprisedb.com>
Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
Co-authored-by: Tao Li <tao.li@enterprisedb.com>
Co-authored-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
(cherry picked from commit 86120ae)
litaocdl added a commit that referenced this pull request Dec 1, 2023
Old versions of CNPG did not set any label or annotation on
PodDisruptionBudgets.
When upgrading to a newer version of CNPG, the metadata
reconciliation of those PDBs failed, and this patch makes it
working.

Closes: #3435

Signed-off-by: YanniHu1996 <yantian.hu@enterprisedb.com>
Signed-off-by: Tao Li <tao.li@enterprisedb.com>
Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
Co-authored-by: Tao Li <tao.li@enterprisedb.com>
Co-authored-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-requested ◀️ This pull request should be backported to all supported releases ok to merge 👌 This PR can be merged release-1.20 release-1.21
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: panic if pdb has no labels while upgrade the operator
4 participants