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: remove chart content not in common.yaml #8884

Merged
merged 1 commit into from Oct 7, 2021

Conversation

BlaineEXE
Copy link
Member

Description of your changes:

Assume common.yaml is the right source of truth, and remove major
content from helm charts that does not exist in common.yaml.

Which issue is resolved by this Pull Request:
Resolves #

Checklist:

  • Commit Message Formatting: Commit titles and messages follow guidelines in the developer guide.
  • Skip Tests for Docs: Add the flag for skipping the build if this is only a documentation change. See here for the flag.
  • Skip Unrelated Tests: Add a flag to run tests for a specific storage provider. See test options.
  • Reviewed the developer guide on Submitting a Pull Request
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.
  • Pending release notes updated with breaking and/or notable changes, if necessary.
  • Upgrade from previous release is tested and upgrade user guide is updated, if necessary.
  • Code generation (make codegen) has been run to update object specifications, if necessary.

Comment on lines -156 to -172
metadata:
name: rook-ceph-system-psp-users
labels:
operator: rook
storage-backend: ceph
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: rook-ceph-system-psp-user
subjects:
- kind: ServiceAccount
name: rook-ceph-system
namespace: {{ .Release.Namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Copy link
Member Author

Choose a reason for hiding this comment

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

rook-ceph-psp-user doesn't exist any more. This seems to be an old vestigial remain.

Comment on lines 40 to 51
- apiGroups:
- monitoring.coreos.com
resources:
- servicemonitors
- prometheusrules
verbs:
- get
- list
- watch
- create
- update
- delete
Copy link
Member Author

Choose a reason for hiding this comment

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

This is also vestigial and covered by monitoring-specific resources that now exist.

build/rbac/rbac.yaml Outdated Show resolved Hide resolved
@BlaineEXE BlaineEXE force-pushed the remove-unused-helm-content branch 3 times, most recently from e770238 to d4ce7ef Compare September 30, 2021 19:50
@BlaineEXE BlaineEXE marked this pull request as ready for review September 30, 2021 19:50
@leseb
Copy link
Member

leseb commented Oct 6, 2021

@Mergifyio rebase

Assume common.yaml is the right source of truth, and remove major
content from helm charts that does not exist in common.yaml.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
@mergify
Copy link

mergify bot commented Oct 6, 2021

Command rebase: success

Branch has been successfully rebased

@leseb leseb force-pushed the remove-unused-helm-content branch from d4ce7ef to 507dfe1 Compare October 6, 2021 09:18
@BlaineEXE
Copy link
Member Author

@travisn this is ready for final review

@travisn travisn merged commit 084dc41 into rook:master Oct 7, 2021
@BlaineEXE BlaineEXE deleted the remove-unused-helm-content branch October 11, 2021 20:40
@BlaineEXE
Copy link
Member Author

@Mergifyio backport

@mergify
Copy link

mergify bot commented Oct 12, 2021

Command backport: failure

No backport have been created
No destination branches found

leseb added a commit that referenced this pull request Oct 13, 2021
helm: remove chart content not in common.yaml  (backport #8884)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants