Skip to content

Commit 1ad9d0c

Browse files
authored
Fix support for full cluster restarts (#883)
Previously, full cluster restarts were not working due to the operator not having permissions. This PR grants the correct permissions.
1 parent 49318b7 commit 1ad9d0c

File tree

5 files changed

+14
-1
lines changed

5 files changed

+14
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
# [Unreleased](https://github.com/cockroachdb/cockroach-operator/compare/v2.6.0...master)
99

10+
## Fixed
11+
12+
* Grant operator deletecollection permissions to fix fullcluster restart flow
13+
1014
# [v2.6.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.5.3...v2.6.0)
1115

1216
## Added

config/rbac/role.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ rules:
148148
resources:
149149
- pods
150150
verbs:
151+
- delete
152+
- deletecollection
151153
- get
152154
- list
153155
- apiGroups:

e2e/decommission/decommission_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package decommission
1919
import (
2020
"context"
2121
"testing"
22+
"time"
2223

2324
"github.com/cockroachdb/cockroach-operator/e2e"
2425
"github.com/cockroachdb/cockroach-operator/pkg/controller"
@@ -86,6 +87,10 @@ func TestDecommissionFunctionalityWithPrune(t *testing.T) {
8687
testutil.RequireDecommissionNode(t, sb, builder, 3)
8788
testutil.RequireDatabaseToFunction(t, sb, builder)
8889
t.Log("Done with decommission")
90+
91+
// Sleeping helps prevents flakes.
92+
time.Sleep(5 * time.Second)
93+
8994
testutil.RequireNumberOfPVCs(t, context.TODO(), sb, builder, 3)
9095
},
9196
},

install/operator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ rules:
161161
resources:
162162
- pods
163163
verbs:
164+
- delete
165+
- deletecollection
164166
- get
165167
- list
166168
- apiGroups:

pkg/controller/cluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type ClusterReconciler struct {
6363
// +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch
6464
// +kubebuilder:rbac:groups=core,resources=configmaps/status,verbs=get
6565
// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch
66-
// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list
66+
// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;delete;deletecollection
6767
// +kubebuilder:rbac:groups=core,resources=pods/exec,verbs=create
6868
// +kubebuilder:rbac:groups=core,resources=pods/log,verbs=get
6969
// +kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list

0 commit comments

Comments
 (0)