Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Commit

Permalink
add list rbac permission for SC (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mojachieee authored Jul 21, 2022
1 parent 89c08d4 commit 59f8542
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 1 deletion.
6 changes: 6 additions & 0 deletions config/rbac/role.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions controllers/etcdcluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -1341,6 +1341,7 @@ func peerNameForMember(member etcd.Member) (string, error) {
// +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;create;delete;patch;list;watch
// +kubebuilder:rbac:groups="monitoring.coreos.com",resources=servicemonitors,verbs=get;create;delete;patch;list;watch
// +kubebuilder:rbac:groups="coordination.k8s.io",resources=leases,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups="storage.k8s.io",resources=storageclasses,verbs=list

func (r *EtcdClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
Expand Down
6 changes: 6 additions & 0 deletions kuttl/e2e/deployment-test/00-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3764,6 +3764,12 @@ rules:
- list
- patch
- watch
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- list
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down
11 changes: 11 additions & 0 deletions kuttl/e2e/deployment-test/02-assert.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 120
---
apiVersion: apps/v1
kind: ReplicaSet
metadata:
name: storageos-etcd-default-sc-0
namespace: storageos-etcd
status:
replicas: 1
35 changes: 35 additions & 0 deletions kuttl/e2e/deployment-test/02-cluster-no-sc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
apiVersion: etcd.improbable.io/v1alpha1
kind: EtcdCluster
metadata:
name: storageos-etcd-default-sc
namespace: storageos-etcd
spec:
replicas: 1
version: 3.5.3
tls:
enabled: true
storage:
volumeClaimTemplate:
resources:
requests:
storage: 1Mi
podTemplate:
resources:
requests:
cpu: 200m
memory: 200Mi
limits:
cpu: 200m
memory: 200Mi
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: etcd.improbable.io/cluster-name
operator: In
values:
- storageos-etcd
topologyKey: kubernetes.io/hostname
2 changes: 1 addition & 1 deletion kuttl/e2e/kuttl-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ startKIND: true
kindContainers:
- storageos/etcd-cluster-operator-controller:develop
- storageos/etcd-cluster-operator-proxy:develop
timeout: 120
timeout: 240

0 comments on commit 59f8542

Please sign in to comment.