Skip to content

Commit ea9f9e1

Browse files
committed
FIXUP: runner
1 parent 2f99c18 commit ea9f9e1

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

internal/controller/runtime/api_discovery.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"k8s.io/apimachinery/pkg/util/sets"
2626
"k8s.io/client-go/discovery"
2727
"k8s.io/client-go/rest"
28-
"sigs.k8s.io/controller-runtime/pkg/manager"
2928

3029
"github.com/crunchydata/postgres-operator/internal/logging"
3130
)
@@ -98,10 +97,6 @@ type APIDiscoveryRunner struct {
9897
}
9998
}
10099

101-
// APIDiscoveryRunner implements [APIs] and [manager.Runnable].
102-
var _ APIs = (*APIDiscoveryRunner)(nil)
103-
var _ manager.Runnable = (*APIDiscoveryRunner)(nil)
104-
105100
// NewAPIDiscoveryRunner creates an [APIDiscoveryRunner] that periodically reads
106101
// what APIs are available in the Kubernetes at config.
107102
func NewAPIDiscoveryRunner(config *rest.Config) (*APIDiscoveryRunner, error) {
@@ -122,7 +117,7 @@ func NewAPIDiscoveryRunner(config *rest.Config) (*APIDiscoveryRunner, error) {
122117
return runner, err
123118
}
124119

125-
// NeedLeaderElection returns false so that r runs any [manager.Manager],
120+
// NeedLeaderElection returns false so that r runs on any [manager.Manager],
126121
// regardless of which is elected leader in the Kubernetes namespace.
127122
func (r *APIDiscoveryRunner) NeedLeaderElection() bool { return false }
128123

internal/controller/runtime/api_discovery_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"testing"
2020

2121
"gotest.tools/v3/assert"
22+
"sigs.k8s.io/controller-runtime/pkg/manager"
2223
)
2324

2425
func TestAPISet(t *testing.T) {
@@ -74,3 +75,11 @@ func TestAPIContext(t *testing.T) {
7475
set[API{Group: "snapshot.storage.k8s.io"}] = struct{}{}
7576
assert.Assert(t, Kubernetes(ctx).Has(API{Group: "snapshot.storage.k8s.io"}))
7677
}
78+
79+
func TestAPIDiscoveryRunnerInterfaces(t *testing.T) {
80+
var _ APIs = new(APIDiscoveryRunner)
81+
var _ manager.Runnable = new(APIDiscoveryRunner)
82+
83+
var runnable manager.LeaderElectionRunnable = new(APIDiscoveryRunner)
84+
assert.Assert(t, false == runnable.NeedLeaderElection())
85+
}

0 commit comments

Comments
 (0)