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.

Sign up for GitHub

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

Jump to bottom

helm: add knob to control cluster level rbac rendering #5229

Merged
merged 4 commits into from
Jun 6, 2024
Merged

helm: add knob to control cluster level rbac rendering #5229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32f3efe
Fix chart rbac file names
hafe Jun 6, 2024
54efe74
helm: add bool to control clusterrole creation
hafe May 15, 2024
87769a6
Merge branch 'main' into chart-rbac-knob
vepatel Jun 6, 2024
701f1f6
Merge branch 'main' into chart-rbac-knob
vepatel Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/nginx-ingress/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
|`controller.telemetryReporting.enable` | Enable telemetry reporting. | true |
|`controller.enableWeightChangesDynamicReload` | Enable weight changes without reloading the NGINX configuration. May require increasing `map_hash_bucket_size`, `map_hash_max_size`, `variable_hash_bucket_size`, and `variable_hash_max_size` in the [ConfigMap](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) if there are many two-way splits. Requires `controller.nginxplus` | false |
|`rbac.create` | Configures RBAC. | true |
|`rbac.clusterrole.create` | Configures creation of ClusterRole. Creation can be disabled when more fine-grained control over RBAC is required. For example when controller.watchNamespace is used. | true |
|`prometheus.create` | Expose NGINX or NGINX Plus metrics in the Prometheus format. | true |
|`prometheus.port` | Configures the port to scrape the metrics. | 9113 |
|`prometheus.scheme` | Configures the HTTP scheme to use for connections to the Prometheus endpoint. | http |
Expand Down
2 changes: 1 addition & 1 deletion charts/nginx-ingress/templates/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.rbac.create }}
{{- if and .Values.rbac.create .Values.rbac.clusterrole.create }}
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand Down
0 ...-ingress/templates/clusterrolebiding.yaml → ...ingress/templates/clusterrolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...ress/templates/controller-rolebiding.yaml → ...ess/templates/controller-rolebinding.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions charts/nginx-ingress/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,10 @@ rbac:
## Configures RBAC.
create: true

clusterrole:
## Create ClusterRole
create: true

prometheus:
## Expose NGINX or NGINX Plus metrics in the Prometheus format.
create: true
Expand Down
1 change: 1 addition & 0 deletions docs/content/installation/installing-nic/installation-with-helm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
| **controller.telemetryReporting.enable** | Enable telemetry reporting. | true |
| **controller.enableWeightChangesDynamicReload** | Enable weight changes without reloading the NGINX configuration. May require increasing `map_hash_bucket_size`, `map_hash_max_size`, `variable_hash_bucket_size`, and `variable_hash_max_size` in the [ConfigMap](https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/) if there are many two-way splits. Requires `controller.nginxplus` | false |
| **rbac.create** | Configures RBAC. | true |
| **rbac.clusterrole.create** | Configures creation of ClusterRole. Creation can be disabled when more fine-grained control over RBAC is required. For example when controller.watchNamespace is used. | true |
| **prometheus.create** | Expose NGINX or NGINX Plus metrics in the Prometheus format. | true |
| **prometheus.port** | Configures the port to scrape the metrics. | 9113 |
| **prometheus.scheme** | Configures the HTTP scheme to use for connections to the Prometheus endpoint. | http |
Expand Down
Loading