Skip to content

Commit a7c947b

Browse files
andrewlecuyergkech
authored andcommitted
Update controller-gen to v0.16.4
Updates to the latest controller-gen release. CRDs and RBAC have been regenerated, and "namespace" has been removed from the markers in the Patroni and pgBackRest Go files (it was no longer providing much benefit since the go code already cleanly organizes the RBAC, and changes to controller controller-gen had the potential to break RBAC generation as a result of its use). Issue: PGO-1748
1 parent 87b89c6 commit a7c947b

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,11 @@ generate-cw: generate-cw-rbac generate-cw-manager generate-cw-bundle
345345
generate-cw-rbac:
346346
$(KUSTOMIZE) build ./config/rbac/cluster/ > ./deploy/cw-rbac.yaml
347347

348+
CONTROLLER ?= hack/tools/controller-gen
349+
tools: tools/controller-gen
350+
tools/controller-gen:
351+
$(call go-get-tool,$(CONTROLLER),sigs.k8s.io/controller-tools/cmd/[email protected])
352+
348353
generate-cw-manager:
349354
cd ./config/manager/cluster && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE)
350355
$(KUSTOMIZE) build ./config/manager/cluster/ > ./deploy/cw-operator.yaml

internal/patroni/rbac.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ import (
1212
)
1313

1414
// "list", "patch", and "watch" are required. Include "get" for good measure.
15-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="pods",verbs={get}
16-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="pods",verbs={list,watch}
17-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="pods",verbs={patch}
15+
// +kubebuilder:rbac:groups="",resources="pods",verbs={get}
16+
// +kubebuilder:rbac:groups="",resources="pods",verbs={list,watch}
17+
// +kubebuilder:rbac:groups="",resources="pods",verbs={patch}
1818

1919
// TODO(cbandy): Separate these so that one can choose ConfigMap over Endpoints.
2020

2121
// When using Endpoints for DCS, "create", "list", "patch", and "watch" are
2222
// required. Include "get" for good measure. The `patronictl scaffold` and
2323
// `patronictl remove` commands require "deletecollection".
24-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="endpoints",verbs={get}
25-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="endpoints",verbs={create,deletecollection}
26-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="endpoints",verbs={list,watch}
27-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="endpoints",verbs={patch}
28-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="services",verbs={create}
24+
// +kubebuilder:rbac:groups="",resources="endpoints",verbs={get}
25+
// +kubebuilder:rbac:groups="",resources="endpoints",verbs={create,deletecollection}
26+
// +kubebuilder:rbac:groups="",resources="endpoints",verbs={list,watch}
27+
// +kubebuilder:rbac:groups="",resources="endpoints",verbs={patch}
28+
// +kubebuilder:rbac:groups="",resources="services",verbs={create}
2929

3030
// The OpenShift RestrictedEndpointsAdmission plugin requires special
3131
// authorization to create Endpoints that contain Pod IPs.
3232
// - https://github.com/openshift/origin/pull/9383
33-
// +kubebuilder:rbac:namespace=patroni,groups="",resources="endpoints/restricted",verbs={create}
33+
// +kubebuilder:rbac:groups="",resources="endpoints/restricted",verbs={create}
3434

3535
// Permissions returns the RBAC rules Patroni needs for cluster.
3636
func Permissions(cluster *v1beta1.PostgresCluster) []rbacv1.PolicyRule {

internal/pgbackrest/rbac.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
1212
)
1313

14-
// +kubebuilder:rbac:namespace=pgbackrest,groups="",resources="pods",verbs={list}
15-
// +kubebuilder:rbac:namespace=pgbackrest,groups="",resources="pods/exec",verbs={create}
14+
// +kubebuilder:rbac:groups="",resources="pods",verbs={list}
15+
// +kubebuilder:rbac:groups="",resources="pods/exec",verbs={create}
1616

1717
// Permissions returns the RBAC rules pgBackRest needs for a cluster.
1818
func Permissions(cluster *v1beta1.PostgresCluster) []rbacv1.PolicyRule {

0 commit comments

Comments
 (0)