Merge pull request #27 from qmhu/disable-le

Disable leader elect

Dockerfile

@@ -2,6 +2,8 @@ ARG PKGNAME
 
 # Build the manager binary
 FROM golang:1.17.2-alpine as builder
+ENV GOPROXY https://proxy.golang.org,direct
+ENV GOSUMDB sum.golang.org
 
 ARG LDFLAGS
 ARG PKGNAME
@@ -10,13 +12,14 @@ WORKDIR /go/src/github.com/gocrane/fadvisor
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
-# cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN go mod download
 
-# Copy the go source
 COPY pkg pkg/
 COPY cmd cmd/
+COPY staging staging/
+
+# cache deps before building and copying source so that we don't need to re-download as much
+# and so that source changes don't invalidate our downloaded layer
+RUN go mod download
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="${LDFLAGS}" -a -o ${PKGNAME} /go/src/github.com/gocrane/fadvisor/cmd/${PKGNAME}/main.go

Makefile

@@ -111,7 +111,7 @@ fadvisor: ## Build binary with the fadvisor.
 images: image-fadvisor
 
 .PHONY: image-fadvisor
-image-fadvisor: test ## Build docker image with the fadvisor.
+image-fadvisor:  ## Build docker image with the fadvisor.
 	docker build --build-arg LDFLAGS=$(LDFLAGS) --build-arg PKGNAME=fadvisor -t ${FADVISOR_IMG} .
 
 

pkg/util/client.go

@@ -113,6 +113,10 @@ func CreateLeaderElectionConfig(
 	k8sClient kubernetes.Interface,
 	eventRecorder events.EventRecorder,
 	LeaderElection componentconfig.LeaderElectionConfiguration) (*leaderelection.LeaderElectionConfig, error) {
+	if !LeaderElection.LeaderElect {
+		return nil, nil
+	}
+
 	hostname, err := os.Hostname()
 	if err != nil {
 		return nil, fmt.Errorf("unable to get hostname: %v", err)