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

helm: don't specify default topology domainlabels in rbd chart (backport #4776) #4778

Merged
merged 1 commit into from
Aug 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2024

Remove the bad default, add commented-out standard labels as a suggestion.

Describe what this PR does

This fixes a problem I noticed while digging into #4775.

It brings the default topology.domainLabels value in line with what the README.md claims (default={}), and in line with what the installer manifest does (leaves the command-line parameter commented out).

Is there anything that requires special attention

I believe this change is beneficial enough to stand on its own. That said, these label definitions are 4 years old, and I don't know what's different between the 3.11.0 and 3.12.0 releases to cause #4775 to occur now.

I had to work around the problem with helm --set topology.domainLabels=[], which worked for me. This PR updates the default to reflect that, and updates the comments to suggest the standard topology labels.

There are two places in the helm chart which reference this value, both are guarded with:

{{- if .Values.topology.domainLabels }}

So I think it doesn't need to be an explicitly empty array ([]), leaving the whole thing commented out is fine.

Related issues

Fixes: #4775

Checklist:

  • Commit Message Formatting: Commit titles and messages follow
    guidelines in the developer
    guide
    .
  • Reviewed the developer guide on Submitting a Pull
    Request
  • Pending release
    notes

    updated with breaking and/or notable changes for the next major release.
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.

Show available bot commands

These commands are normally not required, but in case of issues, leave any of
the following bot commands in an otherwise empty comment in this PR:

  • /retest ci/centos/<job-name>: retest the <job-name> after unrelated
    failure (please report the failure too!)

This is an automatic backport of pull request #4776 done by [Mergify](https://mergify.com).

Remove the bad default, add commented-out standard labels as a suggestion.

Fixes: #4775
Signed-off-by: Mark Glines <mark@glines.org>
(cherry picked from commit 2c0e65b)
@Madhu-1 Madhu-1 requested a review from a team August 19, 2024 10:24
@mergify mergify bot added ok-to-test Label to trigger E2E tests component/deployment Helm chart, kubernetes templates and configuration Issues/PRs labels Aug 19, 2024
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.31

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Aug 19, 2024
@Madhu-1 Madhu-1 added the ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only) label Aug 19, 2024
@mergify mergify bot merged commit 99a7c35 into release-v3.12 Aug 19, 2024
46 checks passed
@mergify mergify bot deleted the mergify/bp/release-v3.12/pr-4776 branch August 19, 2024 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/deployment Helm chart, kubernetes templates and configuration Issues/PRs ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants