Skip to content

Commit 4b5706a

Browse files
dependabot[bot]jimmidyson
dependabot[bot]
and
jimmidyson
authored
build(deps): Bump sigs.k8s.io/controller-runtime from 0.15.1 to 0.16.0 (#119)
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.15.1 to 0.16.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/kubernetes-sigs/controller-runtime/releases">sigs.k8s.io/controller-runtime's releases</a>.</em></p> <blockquote> <h2>v0.16.0</h2> <h2>Highlights</h2> <ul> <li>Granular cache configuration (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2421">#2421</a>)</li> <li>New cache option to fail on missing informer on cache reads (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2406">#2406</a>)</li> <li>Secure metrics serving (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2407">#2407</a>)</li> <li>Upgrade to Kubernetes 1.28 libraries (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2393">#2393</a>, <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2405">#2405</a>, <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2449">#2449</a>)</li> </ul> <h2>Changes since v0.15</h2> <h3>:warning: Breaking Changes</h3> <ul> <li>Bump k8s.io/* dependencies to v1.28.0 by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2393">#2393</a>, <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2405">#2405</a>, <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2449">#2449</a>)</li> <li>Allow configuring more granular cache filtering by <a href="https://github.com/alvaroaleman"><code>@​alvaroaleman</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2421">#2421</a>)</li> <li>Introduce Metrics Options &amp; secure metrics serving by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2407">#2407</a>)</li> <li>Return an error if the continue list option is set for the cache reader by <a href="https://github.com/shuheiktgw"><code>@​shuheiktgw</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2439">#2439</a>)</li> <li>Remove deprecated manager, webhook and cluster options by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2422">#2422</a>)</li> <li>Remove deprecated MultiNamespacedCacheBuilder, NewFakeClientWithScheme, controllerutil.Object, envtest.Environment.KubeAPIServerFlags &amp; zap.Options.DestWritter by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2423">#2423</a>)</li> <li>controller builder: return error when multiple reconcilers are set by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2415">#2415</a>)</li> <li>fake client: use correct RBAC apiGroup name when deciding if to allow unconditional updates by <a href="https://github.com/jaideepr97"><code>@​jaideepr97</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2412">#2412</a>)</li> <li>Minor improvements to godoc &amp; code style in cache pkg by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2416">#2416</a>)</li> </ul> <h3>:sparkles: New Features</h3> <ul> <li>Cache: add ReaderFailOnMissingInformer option by <a href="https://github.com/stevekuznetsov"><code>@​stevekuznetsov</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2406">#2406</a>)</li> <li>Cache: allow non-blocking retrieval of informers by <a href="https://github.com/maxsmythe"><code>@​maxsmythe</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2371">#2371</a>)</li> </ul> <h3>:bug: Bug Fixes</h3> <ul> <li>Add missing return statement in admission.Decoder.DecodeRaw by <a href="https://github.com/lleshchi"><code>@​lleshchi</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2433">#2433</a>)</li> <li>fakeClient.Status().Update(...) cannot recognize resource version conflicts by <a href="https://github.com/iiiceoo"><code>@​iiiceoo</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2365">#2365</a>)</li> <li>Fix Defaulting of the User Agent by <a href="https://github.com/alvaroaleman"><code>@​alvaroaleman</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2435">#2435</a>)</li> <li>Fix logs in the unstructured client by <a href="https://github.com/Poor12"><code>@​Poor12</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2343">#2343</a>)</li> <li>Fix unspecified KindsFor version by <a href="https://github.com/tenstad"><code>@​tenstad</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2346">#2346</a>)</li> <li>Fix TerminalError(nil).Error() panic by <a href="https://github.com/sheidkamp"><code>@​sheidkamp</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2438">#2438</a>)</li> <li>hasLabels and matchingLabels step on each other by <a href="https://github.com/shanshanying"><code>@​shanshanying</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2363">#2363</a>)</li> <li>SetLogger should work with nil sinks by <a href="https://github.com/vincepri"><code>@​vincepri</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2367">#2367</a>)</li> </ul> <h3>:seedling: Others</h3> <ul> <li>Use NewRateLimitingQueueWithConfig instead of deprecated NewNamedRateLimitingQueue by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2411">#2411</a>)</li> <li>Add a prefix to the stack trace printed after SetLogger timeout by <a href="https://github.com/vincepri"><code>@​vincepri</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2357">#2357</a>)</li> <li>Minor improvements to godoc, code style in builder pkg by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2414">#2414</a>)</li> <li>Add integration test to avoid manager.Start deadlocks by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2418">#2418</a>)</li> <li>Automatically regenerate scratch env go mod file by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2413">#2413</a>)</li> <li>Introduce a new runnable group for basic servers of the manager by <a href="https://github.com/zqzten"><code>@​zqzten</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2337">#2337</a>)</li> <li>Add logs around Reconcile call, change webhook logs to log level 5 by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2419">#2419</a>)</li> <li>Add action to update modules on dependabot PRs by <a href="https://github.com/sbueringer"><code>@​sbueringer</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2447">#2447</a>, <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2448">#2448</a>)</li> <li>Optimize Add/RemoveFinalizer by <a href="https://github.com/0xff-dev"><code>@​0xff-dev</code></a> (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2348">#2348</a>)</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/c20ea143a236a34fb331e6c04820b75aac444e7d"><code>c20ea14</code></a> ✨ Allow non-blocking retrieval of informers (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2371">#2371</a>)</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/304027bcbe4b3f6d582180aec5759eb4db3f17fd"><code>304027b</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2451">#2451</a> from sbueringer/pr-log-warn</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/f4735b62c9c638d611e3650f7baf88b4cf6c8c3a"><code>f4735b6</code></a> log warning if error and non-zero Result returned</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/480fc5bed4b1da1e455c993913df1acfafaef013"><code>480fc5b</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2450">#2450</a> from sbueringer/pr-bump-ct-v0.13</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/96854e7349b5f1fb505b0bb6a06dbccf884947d1"><code>96854e7</code></a> Bump to controller-tools v0.13</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/f30e11d97fd19564e71b4f672efcdc0ecad3a8d1"><code>f30e11d</code></a> pkg/{cache,client}: add options for cache miss policy (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2406">#2406</a>)</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/d781099f968893634300630668f86e23dd6f63d6"><code>d781099</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2449">#2449</a> from sbueringer/pr-bump-k8s-1.28</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/2291e7d48f2c95203281857b7551e625954e5f7f"><code>2291e7d</code></a> Bump to k8s.io v1.28.0</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/6d99b58a830fffbec03f568e259872fe53abb2bb"><code>6d99b58</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2433">#2433</a> from lleshchi/issue_2429</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/8a1ef8bf31b730741ca57911f3af2ed9cc4735fa"><code>8a1ef8b</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2446">#2446</a> from kubernetes-sigs/dependabot/go_modules/gomodules...</li> <li>Additional commits viewable in <a href="https://github.com/kubernetes-sigs/controller-runtime/compare/v0.15.1...v0.16.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sigs.k8s.io/controller-runtime&package-manager=go_modules&previous-version=0.15.1&new-version=0.16.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson <[email protected]>
1 parent 8dca5b8 commit 4b5706a

File tree

5 files changed

+47
-54
lines changed

5 files changed

+47
-54
lines changed

‎charts/capi-runtime-extensions/templates/certificates.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,3 @@ spec:
1616
kind: {{ .Values.certificates.issuer.kind }}
1717
name: {{ template "chart.issuerName" . }}
1818
secretName: {{ template "chart.name" . }}-runtimehooks-tls
19-
---
20-
apiVersion: cert-manager.io/v1
21-
kind: Certificate
22-
metadata:
23-
name: {{ template "chart.name" . }}-controllers-tls
24-
namespace: {{ .Release.Namespace }}
25-
labels:
26-
{{- include "chart.labels" . | nindent 4 }}
27-
spec:
28-
dnsNames:
29-
- {{ template "chart.name" . }}-controllers.{{ .Release.Namespace }}.svc
30-
- {{ template "chart.name" . }}-controllers.{{ .Release.Namespace }}.svc.cluster.local
31-
issuerRef:
32-
kind: {{ .Values.certificates.issuer.kind }}
33-
name: {{ template "chart.issuerName" . }}
34-
secretName: {{ template "chart.name" . }}-controllers-tls

‎charts/capi-runtime-extensions/templates/deployment.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ spec:
2828
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default $.Chart.AppVersion }}"
2929
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
3030
args:
31-
- --controllermanager.cert-dir=/controllers-certs/
3231
- --controllermanager.leader-elect={{ if gt (.Values.deployment.replicas | int) 1 }}true{{ else }}{{ .Values.controllers.enableLeaderElection }}{{ end }}
3332
- --runtimehooks.cert-dir=/runtimehooks-certs/
3433
{{- range $key, $value := .Values.handlers }}{{ if $value.enabled }}
@@ -50,9 +49,6 @@ spec:
5049
{{- end }}
5150
{{- end }}
5251
ports:
53-
- containerPort: 8443
54-
name: controllers
55-
protocol: TCP
5652
- containerPort: 9443
5753
name: runtimehooks
5854
protocol: TCP
@@ -70,9 +66,6 @@ spec:
7066
- mountPath: /runtimehooks-certs
7167
name: runtimehooks-cert
7268
readOnly: true
73-
- mountPath: /controllers-certs
74-
name: controllers-cert
75-
readOnly: true
7669
livenessProbe:
7770
httpGet:
7871
port: probes
@@ -92,7 +85,3 @@ spec:
9285
secret:
9386
defaultMode: 420
9487
secretName: {{ template "chart.name" . }}-runtimehooks-tls
95-
- name: controllers-cert
96-
secret:
97-
defaultMode: 420
98-
secretName: {{ template "chart.name" . }}-controllers-tls

‎go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ go 1.20
77

88
require (
99
github.com/go-logr/logr v1.2.4
10-
github.com/onsi/gomega v1.27.8
10+
github.com/onsi/gomega v1.27.10
1111
github.com/spf13/pflag v1.0.5
1212
github.com/stretchr/testify v1.8.4
1313
golang.org/x/sync v0.3.0
14-
gomodules.xyz/jsonpatch/v2 v2.3.0
14+
gomodules.xyz/jsonpatch/v2 v2.4.0
1515
k8s.io/api v0.28.1
1616
k8s.io/apiextensions-apiserver v0.28.1
1717
k8s.io/apimachinery v0.28.1
@@ -20,7 +20,7 @@ require (
2020
k8s.io/klog/v2 v2.100.1
2121
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
2222
sigs.k8s.io/cluster-api v1.5.0
23-
sigs.k8s.io/controller-runtime v0.15.1
23+
sigs.k8s.io/controller-runtime v0.16.0
2424
)
2525

2626
require (
@@ -65,9 +65,10 @@ require (
6565
github.com/prometheus/procfs v0.10.1 // indirect
6666
github.com/spf13/cobra v1.7.0 // indirect
6767
github.com/valyala/fastjson v1.6.4 // indirect
68+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
6869
golang.org/x/net v0.13.0 // indirect
6970
golang.org/x/oauth2 v0.10.0 // indirect
70-
golang.org/x/sys v0.10.0 // indirect
71+
golang.org/x/sys v0.11.0 // indirect
7172
golang.org/x/term v0.10.0 // indirect
7273
golang.org/x/text v0.11.0 // indirect
7374
golang.org/x/time v0.3.0 // indirect

‎go.sum

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
1717
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
1818
github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
1919
github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
20+
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
2021
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
2122
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
2223
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -36,6 +37,7 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
3637
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
3738
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
3839
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
40+
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
3941
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
4042
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
4143
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -47,7 +49,10 @@ github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFD
4749
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
4850
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
4951
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
52+
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
5053
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
54+
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
55+
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
5156
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
5257
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
5358
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -66,6 +71,7 @@ github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
6671
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
6772
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
6873
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
74+
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
6975
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
7076
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
7177
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
@@ -78,6 +84,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
7884
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
7985
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
8086
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
87+
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
8188
github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
8289
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
8390
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
@@ -132,8 +139,11 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
132139
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
133140
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
134141
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
142+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
135143
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
136144
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
145+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
146+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0=
137147
github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
138148
github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
139149
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -213,8 +223,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
213223
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
214224
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
215225
github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
216-
github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
217-
github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
226+
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
227+
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
218228
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
219229
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
220230
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -288,15 +298,27 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
288298
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
289299
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
290300
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
301+
go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs=
302+
go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE=
303+
go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E=
291304
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
292305
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
306+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw=
307+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 h1:sxoY9kG1s1WpSYNyzm24rlwH4lnRYFXUVVBmKMBfRgw=
308+
go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4=
309+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 h1:TaB+1rQhddO1sF71MpZOZAuSPW1klK2M8XxfrBMfK7Y=
310+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 h1:pDDYmo0QadUPal5fwXoY1pmMpFcdyhXOmL5drCrI3vU=
311+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 h1:KtiUEhQmj/Pa874bVYKGNVdq8NPKiacPbaRRtgXi+t4=
312+
go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs=
313+
go.opentelemetry.io/otel/sdk v1.10.0 h1:jZ6K7sVn04kk/3DNUdJ4mqRlGDiXAVuIG+MMENpTNdY=
314+
go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E=
315+
go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
293316
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
294-
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
295317
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
296318
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
297319
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
298320
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
299-
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
321+
go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
300322
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
301323
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
302324
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -311,6 +333,7 @@ golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxT
311333
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
312334
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
313335
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
336+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
314337
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
315338
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
316339
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -373,8 +396,8 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
373396
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
374397
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
375398
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
376-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
377-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
399+
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
400+
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
378401
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
379402
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
380403
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -412,8 +435,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
412435
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
413436
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
414437
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
415-
gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
416-
gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
438+
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
439+
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
417440
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
418441
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
419442
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -440,6 +463,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:
440463
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
441464
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
442465
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
466+
google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
443467
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
444468
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
445469
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
@@ -453,6 +477,7 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
453477
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
454478
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
455479
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
480+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
456481
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
457482
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
458483
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -483,15 +508,17 @@ k8s.io/component-base v0.28.1 h1:LA4AujMlK2mr0tZbQDZkjWbdhTV5bRyEyAFe0TJxlWg=
483508
k8s.io/component-base v0.28.1/go.mod h1:jI11OyhbX21Qtbav7JkhehyBsIRfnO8oEgoAR12ArIU=
484509
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
485510
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
511+
k8s.io/kms v0.28.1 h1:QLNTIc0k7Yebkt9yobj9Y9qBoRCMB4dq+pFCxVXVBnY=
486512
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
487513
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
488514
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
489515
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
490516
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
517+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
491518
sigs.k8s.io/cluster-api v1.5.0 h1:pwXvzScbAwnrB7EWHTApzW+VQfrj2OSrWAQDC9+bcbU=
492519
sigs.k8s.io/cluster-api v1.5.0/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
493-
sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
494-
sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
520+
sigs.k8s.io/controller-runtime v0.16.0 h1:5koYaaRVBHDr0LZAJjO5dWzUjMsh6cwa7q1Mmusrdvk=
521+
sigs.k8s.io/controller-runtime v0.16.0/go.mod h1:77DnuwA8+J7AO0njzv3wbNlMOnGuLrwFr8JPNwx3J7g=
495522
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
496523
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
497524
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎internal/controllermanager/controllermanager.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,26 @@ import (
1313
capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
1414
ctrl "sigs.k8s.io/controller-runtime"
1515
"sigs.k8s.io/controller-runtime/pkg/healthz"
16+
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
1617

1718
capiextv1alpha1 "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1819
)
1920

2021
type Manager struct {
21-
port uint16
22-
webhookCertDir string
2322
metricsAddr string
2423
enableLeaderElection bool
2524
probeAddr string
2625
}
2726

2827
func New() *Manager {
2928
return &Manager{
30-
port: 8443,
31-
webhookCertDir: "/controller-webhooks-certs/",
3229
metricsAddr: ":8080",
3330
probeAddr: ":8081",
3431
enableLeaderElection: false,
3532
}
3633
}
3734

3835
func (m *Manager) AddFlags(prefix string, fs *pflag.FlagSet) {
39-
fs.Uint16Var(&m.port, prefix+".port", m.port, "The address the metric endpoint binds to.")
40-
41-
fs.StringVar(&m.webhookCertDir, prefix+".cert-dir", m.webhookCertDir,
42-
"Controller webhook server cert dir.")
43-
4436
fs.StringVar(&m.metricsAddr, prefix+".metrics-bind-address", m.metricsAddr,
4537
"The address the metric endpoint binds to.")
4638

@@ -61,14 +53,14 @@ func (m *Manager) Start(ctx context.Context) error {
6153
setupLog := ctrl.Log.WithName("controllers")
6254

6355
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
64-
Scheme: scheme,
65-
MetricsBindAddress: m.metricsAddr,
66-
Port: int(m.port),
56+
Scheme: scheme,
57+
Metrics: server.Options{
58+
BindAddress: m.metricsAddr,
59+
},
6760
HealthProbeBindAddress: m.probeAddr,
6861
LeaderElection: m.enableLeaderElection,
6962
LeaderElectionID: capiextv1alpha1.GroupVersion.Group,
7063
LeaderElectionReleaseOnCancel: true,
71-
CertDir: m.webhookCertDir,
7264
})
7365
if err != nil {
7466
setupLog.Error(err, "unable to create manager")

0 commit comments

Comments
 (0)