Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Update rbac.yaml to conditionally create namespace scoped resource RBAC #2194

Merged
merged 6 commits into from
Jul 12, 2018

Conversation

jeremyrickard
Copy link
Contributor

Update rbac.yaml to conditionally create namespace scoped resource RBAC rules. Also adds "appVersion" to the helm chart (we can keep this at the version) so we can update the actual helm chart version (i.e. to fix bugs like this)

Closes: #2193

@k8s-ci-robot k8s-ci-robot requested review from MHBauer and pmorie July 12, 2018 13:34
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 12, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 12, 2018
@@ -106,6 +106,20 @@ items:
- apiGroups: ["servicecatalog.k8s.io"]
resources: ["clusterservicebrokers/status","clusterserviceclasses/status","clusterserviceplans/status","serviceinstances/status","serviceinstances/reference","servicebindings/status"]
verbs: ["update"]
{{- if .Values.namespacedServiceBrokerEnabled }}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

when we remove the gate, we'll need to remove this as well.

@eriknelson
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 12, 2018
Copy link
Contributor

@carolynvs carolynvs left a comment

Choose a reason for hiding this comment

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

Looks good once the changes to Chart.yaml are backed out.

@@ -1,3 +1,4 @@
name: catalog
description: service-catalog API server and controller-manager helm chart
version: 0.1.24
version: 0.1.25
Copy link
Contributor

Choose a reason for hiding this comment

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

This is bumped manually during our releases. You don't need to touch it here.

See https://github.com/kubernetes-incubator/service-catalog/pull/2192/files for what a release looks like.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I think i'll open another issue to allow these to be changed independently. As is, the chart leaves svc cat in a broken state of someone turns on the feature gate, so we should probably do another release (which makes me a little sad)

@k8s-ci-robot k8s-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 12, 2018
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@jeremyrickard
Copy link
Contributor Author

@carolynvs removed the change to Chart.yaml

Copy link
Contributor

@carolynvs carolynvs left a comment

Choose a reason for hiding this comment

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

LGTM :shipit:

@carolynvs
Copy link
Contributor

@eriknelson Are you able to add the LGTM2 label and merge once the tests pass? If not, let me know so that we can fix your perms.

We aren't using /lgtm yet as an official way to flag stuff as ready to merge yet (that happens after the prow move).

@eriknelson
Copy link
Contributor

@carolynvs woops, yeah I'll add the label manually.

Copy link
Contributor

@MHBauer MHBauer left a comment

Choose a reason for hiding this comment

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

seems fine. the duplication irritates me. not sure what to do about it. I don't want to mess with go templates and variables. probably better to be explicit and hope it stays in sync.
/approve
had one more thing to add, but I forgot.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MHBauer

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

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 12, 2018
@eriknelson
Copy link
Contributor

Think we have a consensus. Merging!

@eriknelson eriknelson merged commit 8ad4922 into kubernetes-retired:master Jul 12, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. LGTM1 LGTM2 size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Helm Chart Does Not Create RBAC For Namespace Scoped Resources
5 participants