Skip to content

Commit c16b91f

Browse files
author
Stavros Kontopoulos
committed
try c-r leader election mechanism
1 parent bfa200e commit c16b91f

File tree

4 files changed

+2
-251
lines changed

4 files changed

+2
-251
lines changed

knative-operator/cmd/manager/main.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"context"
54
"errors"
65
"flag"
76
"fmt"
@@ -13,7 +12,6 @@ import (
1312
"github.com/openshift-knative/serverless-operator/knative-operator/pkg/webhook/knativeeventing"
1413
"github.com/openshift-knative/serverless-operator/knative-operator/pkg/webhook/knativekafka"
1514
"github.com/openshift-knative/serverless-operator/knative-operator/pkg/webhook/knativeserving"
16-
"github.com/operator-framework/operator-sdk/pkg/leader"
1715
"github.com/spf13/pflag"
1816
"go.uber.org/zap"
1917
"go.uber.org/zap/zapcore"
@@ -56,18 +54,11 @@ func main() {
5654
os.Exit(1)
5755
}
5856

59-
ctx := context.TODO()
60-
// Become the leader before proceeding
61-
// This needs to remain "knative-serving-openshift-lock" to allow for safe upgrades.
62-
err = leader.Become(ctx, "knative-serving-openshift-lock")
63-
if err != nil {
64-
log.Error(err, "")
65-
os.Exit(1)
66-
}
67-
6857
// Create a new Cmd to provide shared dependencies and start components
6958
mgr, err := manager.New(cfg, manager.Options{
7059
Namespace: "", // The serverless operator always watches all namespaces.
60+
LeaderElection: true,
61+
LeaderElectionID: "knative-serving-openshift-lock",
7162
MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
7263
HealthProbeBindAddress: fmt.Sprintf(":%d", healthPort),
7364
})

knative-operator/vendor/github.com/operator-framework/operator-sdk/pkg/leader/doc.go

Lines changed: 0 additions & 54 deletions
This file was deleted.

knative-operator/vendor/github.com/operator-framework/operator-sdk/pkg/leader/leader.go

Lines changed: 0 additions & 185 deletions
This file was deleted.

knative-operator/vendor/modules.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ github.com/openzipkin/zipkin-go/model
107107
## explicit
108108
github.com/operator-framework/operator-sdk/pkg/k8sutil
109109
github.com/operator-framework/operator-sdk/pkg/kube-metrics
110-
github.com/operator-framework/operator-sdk/pkg/leader
111110
github.com/operator-framework/operator-sdk/pkg/metrics
112111
# github.com/pkg/errors v0.9.1
113112
github.com/pkg/errors

0 commit comments

Comments
 (0)