Skip to content

Commit cae7e8f

Browse files
authored
Merge pull request #473 from aramase/controller-runtime-v0.8.x
chore: upgrade to controller-runtime v0.8.2
2 parents 8787502 + da67ee3 commit cae7e8f

File tree

4 files changed

+213
-156
lines changed

4 files changed

+213
-156
lines changed

cmd/secrets-store-csi-driver/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func main() {
142142

143143
go func() {
144144
klog.Infof("starting manager")
145-
if err := mgr.Start(ctx.Done()); err != nil {
145+
if err := mgr.Start(ctx); err != nil {
146146
klog.Fatalf("failed to run manager, error: %+v", err)
147147
}
148148
}()
@@ -175,7 +175,7 @@ func main() {
175175
// the process receives termination signals.
176176
func withShutdownSignal(ctx context.Context) context.Context {
177177
nctx, cancel := context.WithCancel(ctx)
178-
stopCh := ctrl.SetupSignalHandler()
178+
stopCh := ctrl.SetupSignalHandler().Done()
179179

180180
go func() {
181181
<-stopCh

controllers/secretproviderclasspodstatus_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,10 @@ func (r *SecretProviderClassPodStatusReconciler) ListOptionsLabelSelector() clie
175175
// +kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch
176176
// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
177177

178-
func (r *SecretProviderClassPodStatusReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
178+
func (r *SecretProviderClassPodStatusReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
179179
r.mutex.Lock()
180180
defer r.mutex.Unlock()
181181

182-
ctx := context.Background()
183182
klog.InfoS("reconcile started", "spcps", req.NamespacedName.String())
184183

185184
spcPodStatus := &v1alpha1.SecretProviderClassPodStatus{}

go.mod

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@ require (
88
github.com/google/go-cmp v0.5.2
99
github.com/kubernetes-csi/csi-lib-utils v0.7.1
1010
github.com/kubernetes-csi/csi-test/v4 v4.0.2
11-
github.com/onsi/gomega v1.10.1
11+
github.com/onsi/gomega v1.10.2
1212
github.com/prometheus/client_golang v1.8.0
1313
github.com/stretchr/testify v1.6.1
1414
go.opentelemetry.io/otel v0.13.0
1515
go.opentelemetry.io/otel/exporters/metric/prometheus v0.13.0
16-
golang.org/x/net v0.0.0-20200707034311-ab3426394381
17-
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf // indirect
16+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
1817
google.golang.org/grpc v1.29.1
1918
google.golang.org/protobuf v1.25.0
20-
k8s.io/api v0.19.3
21-
k8s.io/apimachinery v0.19.3
22-
k8s.io/client-go v0.19.3
23-
k8s.io/component-base v0.19.3
19+
k8s.io/api v0.20.2
20+
k8s.io/apimachinery v0.20.2
21+
k8s.io/client-go v0.20.2
22+
k8s.io/component-base v0.20.2
2423
k8s.io/klog/v2 v2.5.0
25-
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
26-
sigs.k8s.io/controller-runtime v0.6.3
24+
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
25+
sigs.k8s.io/controller-runtime v0.8.2
2726
)

0 commit comments

Comments
 (0)