Skip to content

HIVE-2819: Use annotation instead of label for upgradeable#2650

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
AlexVulaj:HIVE-2819_upgradeable-label-to-annotation
Apr 1, 2025
Merged

HIVE-2819: Use annotation instead of label for upgradeable#2650
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
AlexVulaj:HIVE-2819_upgradeable-label-to-annotation

Conversation

@AlexVulaj
Copy link
Copy Markdown
Contributor

@AlexVulaj AlexVulaj commented Apr 1, 2025

This is a follow up to #2639 , but moving the value to the cluster deployment annotations instead of labels. This change is due to an issue found with certain allowed characters for labels that do not affect annotations.

For example, the following error was seen testing the labels from the previous PR:

time="2025-04-01T15:52:28.453Z" level=error msg="Reconciler error" controller=clusterversion-controller error="...a valid label must be an empty string or consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyValue',  or 'my_value',  or '12345', regex used for validation is '(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?')]"

@openshift-ci openshift-ci Bot requested review from 2uasimojo and jstuever April 1, 2025 19:31
@wking
Copy link
Copy Markdown
Member

wking commented Apr 1, 2025

Colon-delim for the Jira-linking bots:

/retitle HIVE-2819: Use annotation instead of label for upgradeable

@openshift-ci openshift-ci Bot changed the title HIVE-2819 | (fix): Use annotation instead of label for upgradeable HIVE-2819: Use annotation instead of label for upgradeable Apr 1, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 1, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 1, 2025

@AlexVulaj: This pull request references HIVE-2819 which is a valid jira issue.

Details

In response to this:

This is a follow up to #2639 , but moving the value to the cluster deployment annotations instead of labels. This change is due to an issue found with certain allowed characters for labels that do not affect annotations.

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Copy Markdown
Member

@2uasimojo 2uasimojo left a comment

Choose a reason for hiding this comment

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

Sane

/lgtm

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 1, 2025
Copy link
Copy Markdown
Member

@wking wking left a comment

Choose a reason for hiding this comment

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

/lgtm

Any way we can test this new iteration vs. a 4.15 cluster (or other cluster that will exercise this logic) pre-merge?

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 2uasimojo, AlexVulaj, wking

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

The pull request process is described here

Details 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

@2uasimojo
Copy link
Copy Markdown
Member

Any way we can test this new iteration vs. a 4.15 cluster (or other cluster that will exercise this logic) pre-merge?

Oh, yeah, I did say I would build and deploy this first.

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 1, 2025

@AlexVulaj: This pull request references HIVE-2819 which is a valid jira issue.

Details

In response to this:

This is a follow up to #2639 , but moving the value to the cluster deployment annotations instead of labels. This change is due to an issue found with certain allowed characters for labels that do not affect annotations.

For example, the following error was seen testing the labels from the previous PR:

time="2025-04-01T15:52:28.453Z" level=error msg="Reconciler error" controller=clusterversion-controller error="...a valid label must be an empty string or consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyValue',  or 'my_value',  or '12345', regex used for validation is '(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?')]"

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 openshift-eng/jira-lifecycle-plugin repository.

@2uasimojo
Copy link
Copy Markdown
Member

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 1, 2025

@AlexVulaj: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 1, 2025

Codecov Report

Attention: Patch coverage is 66.66667% with 3 lines in your changes missing coverage. Please review.

Project coverage is 50.14%. Comparing base (8d518a3) to head (06b910d).
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
...roller/clusterversion/clusterversion_controller.go 66.66% 2 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2650   +/-   ##
=======================================
  Coverage   50.14%   50.14%           
=======================================
  Files         281      281           
  Lines       33298    33300    +2     
=======================================
+ Hits        16696    16698    +2     
  Misses      15261    15261           
  Partials     1341     1341           
Files with missing lines Coverage Δ
...roller/clusterversion/clusterversion_controller.go 46.34% <66.66%> (+0.88%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@openshift-merge-bot openshift-merge-bot Bot merged commit 8b47aef into openshift:master Apr 1, 2025
10 checks passed
@AlexVulaj AlexVulaj deleted the HIVE-2819_upgradeable-label-to-annotation branch April 2, 2025 13:15
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants