Skip to content

Commit

Permalink
Merge pull request #97 from gardener/switch-leader-election-to-leases
Browse files Browse the repository at this point in the history
Switch default leader election resource lock to leases
  • Loading branch information
mandelsoft authored Jan 4, 2022
2 parents ba6f702 + 41af732 commit ec7c4a2
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ Flags:
--lease-duration duration lease duration
--lease-name string name for lease object
--lease-renew-deadline duration lease renew deadline
--lease-resource-lock string determines which resource lock to use for leader election, defaults to 'configmapsleases'
--lease-resource-lock string determines which resource lock to use for leader election, defaults to 'leases'
--lease-retry-period duration lease retry period
-D, --log-level string logrus log level
--maintainer string maintainer key for crds (default "cert-controller-manager")
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

require (
github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
github.com/gardener/controller-manager-library v0.2.1-0.20210915114933-bfc0604c32c5
github.com/gardener/controller-manager-library v0.2.1-0.20220103153255-cff2a133a1e6
github.com/gardener/external-dns-management v0.7.21
github.com/go-acme/lego/v4 v4.5.3
github.com/miekg/dns v1.1.43
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/gardener/controller-manager-library v0.2.1-0.20201009144316-bfa57b871e60/go.mod h1:XMp1tPcX3SP/dMd+3id418f5Cqu44vydeTkBRbW8EvQ=
github.com/gardener/controller-manager-library v0.2.1-0.20210915114933-bfc0604c32c5 h1:HOZugGSJkzd/rgSfqgPM8Ku4c1JJMD0rPONWGWl0UkU=
github.com/gardener/controller-manager-library v0.2.1-0.20210915114933-bfc0604c32c5/go.mod h1:E1Abd/nMB9pbwEiEHPADjsPgbJRJG90WlU28yim2DG4=
github.com/gardener/controller-manager-library v0.2.1-0.20220103153255-cff2a133a1e6 h1:MqtxlnDxgnBnsPk54xwSVpJlQQ6xO429Z0ep4hYwTwo=
github.com/gardener/controller-manager-library v0.2.1-0.20220103153255-cff2a133a1e6/go.mod h1:E1Abd/nMB9pbwEiEHPADjsPgbJRJG90WlU28yim2DG4=
github.com/gardener/external-dns-management v0.7.21 h1:fuRFc2fGs1hkR7CJ3D7IiDplTE5pfuZj+otmTP/YKjc=
github.com/gardener/external-dns-management v0.7.21/go.mod h1:QJM0IUSQhbK25ftg4ZvFHQuGuT7ScX6Xw4hCxO0j0IM=
github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
Expand Down
2 changes: 1 addition & 1 deletion test/functional/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ fi

if [ "$RUN_CONTROLLER" == "true" ]; then
go build -mod=vendor -o $ROOTDIR/cert-controller-manager $ROOTDIR/cmd/cert-controller-manager
$ROOTDIR/cert-controller-manager --dns $DNS_KUBECONFIG >/dev/null 2>&1 &
$ROOTDIR/cert-controller-manager --dns $DNS_KUBECONFIG >/tmp/functest-cert-controller-manager.log 2>&1 &
PID_CONTROLLER=$!
fi

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ github.com/fatih/color
# github.com/fsnotify/fsnotify v1.4.9
## explicit; go 1.13
github.com/fsnotify/fsnotify
# github.com/gardener/controller-manager-library v0.2.1-0.20210915114933-bfc0604c32c5
# github.com/gardener/controller-manager-library v0.2.1-0.20220103153255-cff2a133a1e6
## explicit; go 1.16
github.com/gardener/controller-manager-library/hack
github.com/gardener/controller-manager-library/pkg/certmgmt
Expand Down

0 comments on commit ec7c4a2

Please sign in to comment.