Vendor dependencies

.github/pull_request_template.md

@@ -32,9 +32,9 @@ Write your release note:
 
 Format of block header: <category> <target_group>
 Possible values:
-- category:       improvement|noteworthy|action
-- target_group:   user|operator|developer
+- category:       breaking|feature|bugfix|doc|other
+- target_group:   user|operator|developer|dependency
 -->
-```improvement operator
+```other operator
 
 ```

Dockerfile

@@ -1,5 +1,5 @@
 ############# builder
-FROM eu.gcr.io/gardener-project/3rd/golang:1.15.5 AS builder
+FROM eu.gcr.io/gardener-project/3rd/golang:1.15.7 AS builder
 
 WORKDIR /go/src/github.com/gardener/gardener-resource-manager
 COPY . .
@@ -8,7 +8,7 @@ ARG EFFECTIVE_VERSION
 RUN make install EFFECTIVE_VERSION=$EFFECTIVE_VERSION
 
 #############      gardener-resource-manager
-FROM eu.gcr.io/gardener-project/3rd/alpine:3.12.1 AS gardener-resource-manager
+FROM eu.gcr.io/gardener-project/3rd/alpine:3.12.3 AS gardener-resource-manager
 
 COPY --from=builder /go/bin/gardener-resource-manager /gardener-resource-manager
 ENTRYPOINT ["/gardener-resource-manager"]

charts/gardener-resource-manager/templates/_helpers.tpl

@@ -0,0 +1,3 @@
+{{- define "leaderelectionid" -}}
+gardener-resource-manager
+{{- end -}}

charts/gardener-resource-manager/templates/deployment.yaml

@@ -35,6 +35,7 @@ spec:
         - --leader-election-lease-duration={{ .Values.leaderElection.leaseDuration }}
         - --leader-election-renew-deadline={{ .Values.leaderElection.renewDeadline }}
         - --leader-election-retry-period={{ .Values.leaderElection.retryPeriod }}
+        - --leader-election-id={{ include "leaderelectionid" . }}
         {{- if .Values.controllers.cacheResyncPeriod }}
         - --cache-resync-period={{ .Values.controllers.cacheResyncPeriod }}
         {{- end }}

charts/gardener-resource-manager/templates/rbac.yaml

@@ -41,12 +41,28 @@ rules:
   resources:
   - configmaps
   resourceNames:
-  - gardener-resource-manager
+  - {{ include "leaderelectionid" . }}
   verbs:
   - get
   - watch
   - update
   - patch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  resourceNames:
+  - {{ include "leaderelectionid" . }}
+  verbs:
+  - update
+  - get
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

cmd/gardener-resource-manager/app/app.go

@@ -109,23 +109,23 @@ func NewResourceManagerCommand() *cobra.Command {
 				defer wg.Done()
 
 				wg.Add(1)
-				if err := targetClientOpts.Completed().Start(ctx.Done()); err != nil {
+				if err := targetClientOpts.Completed().Start(ctx); err != nil {
 					errChan <- fmt.Errorf("error syncing target cache: %w", err)
 				}
 			}()
 
 			ctxWaitForCache, cancelWaitForCache := context.WithTimeout(ctx, 5*time.Minute)
 			defer cancelWaitForCache()
 
-			if !targetClientOpts.Completed().WaitForCacheSync(ctxWaitForCache.Done()) {
+			if !targetClientOpts.Completed().WaitForCacheSync(ctxWaitForCache) {
 				return fmt.Errorf("timed out waiting for target cache to sync")
 			}
 
 			go func() {
 				defer wg.Done()
 
 				wg.Add(1)
-				if err := mgr.Start(ctx.Done()); err != nil {
+				if err := mgr.Start(ctx); err != nil {
 					errChan <- fmt.Errorf("error running manager: %w", err)
 				}
 			}()

cmd/gardener-resource-manager/main.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"context"
 	"os"
 
 	"github.com/gardener/gardener-resource-manager/cmd/gardener-resource-manager/app"
@@ -27,16 +26,9 @@ import (
 
 func main() {
 	runtimelog.SetLogger(log.ZapLogger(false))
+	ctx := signals.SetupSignalHandler()
 
-	ctx, cancel := context.WithCancel(context.Background())
-	go func() {
-		defer cancel()
-		<-signals.SetupSignalHandler()
-	}()
-
-	cmd := app.NewResourceManagerCommand()
-
-	if err := cmd.ExecuteContext(ctx); err != nil {
+	if err := app.NewResourceManagerCommand().ExecuteContext(ctx); err != nil {
 		runtimelog.Log.Error(err, "error executing the main controller command")
 		os.Exit(1)
 	}

go.mod

@@ -3,32 +3,31 @@ module github.com/gardener/gardener-resource-manager
 go 1.15
 
 require (
-	github.com/gardener/gardener v1.12.8
+	github.com/gardener/gardener v1.16.0
 	github.com/gardener/gardener-resource-manager/api v0.0.0-00010101000000-000000000000
 	github.com/gardener/hvpa-controller v0.3.1
-	github.com/go-logr/logr v0.1.0
+	github.com/go-logr/logr v0.3.0
 	github.com/golang/mock v1.4.4-0.20200731163441-8734ec565a4d
 	github.com/hashicorp/go-multierror v1.0.0
-	github.com/onsi/ginkgo v1.14.0
-	github.com/onsi/gomega v1.10.1
-	github.com/spf13/cobra v0.0.6
+	github.com/onsi/ginkgo v1.14.1
+	github.com/onsi/gomega v1.10.2
+	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
-	go.uber.org/zap v1.13.0
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	k8s.io/api v0.18.10
-	k8s.io/apiextensions-apiserver v0.18.10
-	k8s.io/apimachinery v0.18.10
+	go.uber.org/zap v1.15.0
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
+	k8s.io/api v0.19.6
+	k8s.io/apiextensions-apiserver v0.19.6
+	k8s.io/apimachinery v0.19.6
 	k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/code-generator v0.18.10
-	k8s.io/kube-aggregator v0.18.10
-	k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
-	k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
-	sigs.k8s.io/controller-runtime v0.6.3
+	k8s.io/code-generator v0.19.6
+	k8s.io/kube-aggregator v0.19.6
+	k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
+	k8s.io/utils v0.0.0-20200912215256-4140de9c8800
+	sigs.k8s.io/controller-runtime v0.7.1
 )
 
 replace (
 	github.com/gardener/gardener-resource-manager/api => ./api
-	k8s.io/client-go => k8s.io/client-go v0.18.10
-	sigs.k8s.io/controller-runtime => github.com/gardener/controller-runtime v0.6.3-gardener.1
+	k8s.io/client-go => k8s.io/client-go v0.19.6
 )