Skip to content

Commit 3eae908

Browse files
hj-johannes-leehj-johannes-lee
authored
Merge pull request #1507 from mythi/PR-2023-039
go.mod: bump sigs.k8s.io/controller-runtime from 0.15.1 to 0.16.0
2 parents 6861ef5 + 60530ec commit 3eae908

File tree

6 files changed

+53
-31
lines changed

6 files changed

+53
-31
lines changed

‎cmd/fpga_admissionwebhook/main.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
package main
1616

1717
import (
18+
"crypto/tls"
1819
"flag"
1920
"os"
2021

2122
"k8s.io/apimachinery/pkg/runtime"
2223
"k8s.io/klog/v2"
2324
"k8s.io/klog/v2/klogr"
2425
ctrl "sigs.k8s.io/controller-runtime"
26+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2527
"sigs.k8s.io/controller-runtime/pkg/webhook"
2628
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2729

@@ -53,18 +55,24 @@ func main() {
5355

5456
ctrl.SetLogger(klogr.New())
5557

58+
tlsCfgFunc := func(cfg *tls.Config) {
59+
cfg.MinVersion = tls.VersionTLS13
60+
}
61+
5662
webhookOptions := webhook.Options{
57-
Port: 9443,
58-
TLSMinVersion: "1.3",
63+
Port: 9443,
64+
TLSOpts: []func(*tls.Config){
65+
tlsCfgFunc,
66+
},
5967
}
6068

6169
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
62-
Scheme: scheme,
63-
MetricsBindAddress: "0",
64-
Logger: ctrl.Log.WithName("FpgaAdmissionWebhook"),
65-
WebhookServer: webhook.NewServer(webhookOptions),
66-
LeaderElection: enableLeaderElection,
67-
LeaderElectionID: "f2c6a4df.intel.com",
70+
Scheme: scheme,
71+
Metrics: metricsserver.Options{BindAddress: "0"},
72+
Logger: ctrl.Log.WithName("FpgaAdmissionWebhook"),
73+
WebhookServer: webhook.NewServer(webhookOptions),
74+
LeaderElection: enableLeaderElection,
75+
LeaderElectionID: "f2c6a4df.intel.com",
6876
})
6977
if err != nil {
7078
setupLog.Error(err, "unable to start manager")

‎cmd/operator/main.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package main
1616

1717
import (
18+
"crypto/tls"
1819
"flag"
1920
"fmt"
2021
"os"
@@ -27,6 +28,7 @@ import (
2728
"k8s.io/klog/v2/klogr"
2829
ctrl "sigs.k8s.io/controller-runtime"
2930
"sigs.k8s.io/controller-runtime/pkg/healthz"
31+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3032
"sigs.k8s.io/controller-runtime/pkg/webhook"
3133
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
3234

@@ -131,14 +133,20 @@ func main() {
131133
"sgx": sgx.SetupReconciler,
132134
}
133135

136+
tlsCfgFunc := func(cfg *tls.Config) {
137+
cfg.MinVersion = tls.VersionTLS13
138+
}
139+
134140
webhookOptions := webhook.Options{
135-
Port: 9443,
136-
TLSMinVersion: "1.3",
141+
Port: 9443,
142+
TLSOpts: []func(*tls.Config){
143+
tlsCfgFunc,
144+
},
137145
}
138146

139147
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
140148
Scheme: scheme,
141-
MetricsBindAddress: metricsAddr,
149+
Metrics: metricsserver.Options{BindAddress: metricsAddr},
142150
Logger: ctrl.Log.WithName("intel-device-plugins-manager"),
143151
WebhookServer: webhook.NewServer(webhookOptions),
144152
HealthProbeBindAddress: probeAddr,

‎cmd/sgx_admissionwebhook/main.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package main
1616

1717
import (
18+
"crypto/tls"
1819
"os"
1920

2021
sgxwebhook "github.com/intel/intel-device-plugins-for-kubernetes/pkg/webhooks/sgx"
@@ -23,6 +24,7 @@ import (
2324
"k8s.io/klog/v2/klogr"
2425
ctrl "sigs.k8s.io/controller-runtime"
2526
"sigs.k8s.io/controller-runtime/pkg/builder"
27+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2628
"sigs.k8s.io/controller-runtime/pkg/webhook"
2729
)
2830

@@ -37,15 +39,21 @@ func init() {
3739
func main() {
3840
ctrl.SetLogger(klogr.New())
3941

42+
tlsCfgFunc := func(cfg *tls.Config) {
43+
cfg.MinVersion = tls.VersionTLS13
44+
}
45+
4046
webhookOptions := webhook.Options{
41-
Port: 9443,
42-
TLSMinVersion: "1.3",
47+
Port: 9443,
48+
TLSOpts: []func(*tls.Config){
49+
tlsCfgFunc,
50+
},
4351
}
4452

4553
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
46-
MetricsBindAddress: "0",
47-
Logger: ctrl.Log.WithName("SgxAdmissionWebhook"),
48-
WebhookServer: webhook.NewServer(webhookOptions),
54+
Metrics: metricsserver.Options{BindAddress: "0"},
55+
Logger: ctrl.Log.WithName("SgxAdmissionWebhook"),
56+
WebhookServer: webhook.NewServer(webhookOptions),
4957
})
5058
if err != nil {
5159
setupLog.Error(err, "unable to start manager")

‎go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
k8s.io/kubernetes v1.28.0
2828
k8s.io/pod-security-admission v0.0.0
2929
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
30-
sigs.k8s.io/controller-runtime v0.15.1
30+
sigs.k8s.io/controller-runtime v0.16.0
3131
sigs.k8s.io/yaml v1.3.0
3232
)
3333

@@ -92,9 +92,8 @@ require (
9292
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
9393
go.opentelemetry.io/otel/trace v1.10.0 // indirect
9494
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
95-
go.uber.org/atomic v1.10.0 // indirect
9695
go.uber.org/multierr v1.11.0 // indirect
97-
go.uber.org/zap v1.24.0 // indirect
96+
go.uber.org/zap v1.25.0 // indirect
9897
golang.org/x/crypto v0.11.0 // indirect
9998
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
10099
golang.org/x/mod v0.10.0 // indirect
@@ -104,7 +103,7 @@ require (
104103
golang.org/x/term v0.10.0 // indirect
105104
golang.org/x/time v0.3.0 // indirect
106105
golang.org/x/tools v0.9.3 // indirect
107-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
106+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
108107
google.golang.org/appengine v1.6.7 // indirect
109108
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
110109
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
@@ -113,7 +112,7 @@ require (
113112
gopkg.in/inf.v0 v0.9.1 // indirect
114113
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
115114
gopkg.in/yaml.v3 v3.0.1 // indirect
116-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
115+
k8s.io/apiextensions-apiserver v0.28.0 // indirect
117116
k8s.io/apiserver v0.28.0 // indirect
118117
k8s.io/cloud-provider v0.0.0 // indirect
119118
k8s.io/component-helpers v0.28.0 // indirect

‎go.sum

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/g
4747
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
4848
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
4949
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
50-
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
50+
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
5151
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
5252
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
5353
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -337,13 +337,11 @@ go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/A
337337
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
338338
go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
339339
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
340-
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
341-
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
342340
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
343341
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
344342
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
345-
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
346-
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
343+
go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
344+
go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
347345
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
348346
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
349347
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -531,8 +529,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
531529
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
532530
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
533531
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
534-
gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
535-
gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
532+
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
533+
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
536534
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
537535
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
538536
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -691,8 +689,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
691689
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
692690
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
693691
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
694-
sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
695-
sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
692+
sigs.k8s.io/controller-runtime v0.16.0 h1:5koYaaRVBHDr0LZAJjO5dWzUjMsh6cwa7q1Mmusrdvk=
693+
sigs.k8s.io/controller-runtime v0.16.0/go.mod h1:77DnuwA8+J7AO0njzv3wbNlMOnGuLrwFr8JPNwx3J7g=
696694
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
697695
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
698696
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎test/envtest/suite_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"sigs.k8s.io/controller-runtime/pkg/client"
3838
"sigs.k8s.io/controller-runtime/pkg/envtest"
3939
logf "sigs.k8s.io/controller-runtime/pkg/log"
40+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4041

4142
"github.com/intel/intel-device-plugins-for-kubernetes/deployments"
4243
devicepluginv1 "github.com/intel/intel-device-plugins-for-kubernetes/pkg/apis/deviceplugin/v1"
@@ -107,7 +108,7 @@ var _ = AfterEach(func() {
107108
})
108109

109110
func up() {
110-
k8sManager, managerErr := ctrl.NewManager(cfg, ctrl.Options{Scheme: scheme.Scheme, MetricsBindAddress: "0"})
111+
k8sManager, managerErr := ctrl.NewManager(cfg, ctrl.Options{Scheme: scheme.Scheme, Metrics: metricsserver.Options{BindAddress: "0"}})
111112
Expect(managerErr).To(BeNil())
112113

113114
withWebhook := true

0 commit comments

Comments
 (0)