Skip to content

Commit ad02fc4

Browse files
authored
Merge pull request #493 from rojkov/release-0.19
Upgrade to k8s v1.19.3
2 parents 047f333 + 5f0da56 commit ad02fc4

File tree

21 files changed

+554
-428
lines changed

21 files changed

+554
-428
lines changed

cmd/fpga_admissionwebhook/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ func main() {
5757
Scheme: scheme,
5858
MetricsBindAddress: metricsAddr,
5959
Port: 9443,
60+
Logger: ctrl.Log.WithName("FpgaAdmissionWebhook"),
6061
LeaderElection: enableLeaderElection,
6162
LeaderElectionID: "f2c6a4df.intel.com",
6263
})
@@ -73,7 +74,6 @@ func main() {
7374

7475
if err = (&controllers.AcceleratorFunctionReconciler{
7576
Client: mgr.GetClient(),
76-
Log: ctrl.Log.WithName("controllers").WithName("AcceleratorFunction"),
7777
Scheme: mgr.GetScheme(),
7878
PatcherManager: pm,
7979
}).SetupWithManager(mgr); err != nil {
@@ -83,7 +83,6 @@ func main() {
8383

8484
if err = (&controllers.FpgaRegionReconciler{
8585
Client: mgr.GetClient(),
86-
Log: ctrl.Log.WithName("controllers").WithName("FpgaRegion"),
8786
Scheme: mgr.GetScheme(),
8887
PatcherManager: pm,
8988
}).SetupWithManager(mgr); err != nil {

cmd/operator/main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ func main() {
122122

123123
if err = (&fpgacontroller.AcceleratorFunctionReconciler{
124124
Client: mgr.GetClient(),
125-
Log: mgr.GetLogger().WithName("controllers").WithName("AcceleratorFunction"),
126125
Scheme: mgr.GetScheme(),
127126
PatcherManager: pm,
128127
}).SetupWithManager(mgr); err != nil {
@@ -132,7 +131,6 @@ func main() {
132131

133132
if err = (&fpgacontroller.FpgaRegionReconciler{
134133
Client: mgr.GetClient(),
135-
Log: mgr.GetLogger().WithName("controllers").WithName("FpgaRegion"),
136134
Scheme: mgr.GetScheme(),
137135
PatcherManager: pm,
138136
}).SetupWithManager(mgr); err != nil {

deployments/operator/rbac/role.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,21 @@ rules:
2626
- patch
2727
- update
2828
- watch
29+
- apiGroups:
30+
- coordination.k8s.io
31+
resources:
32+
- leases
33+
verbs:
34+
- create
35+
- apiGroups:
36+
- coordination.k8s.io
37+
resourceNames:
38+
- d1c7b6d5.intel.com
39+
resources:
40+
- leases
41+
verbs:
42+
- get
43+
- update
2944
- apiGroups:
3045
- deviceplugin.intel.com
3146
resources:

go.mod

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,50 @@ go 1.15
55
require (
66
github.com/fsnotify/fsnotify v1.4.9
77
github.com/go-ini/ini v1.46.0
8-
github.com/go-logr/logr v0.1.0
8+
github.com/go-logr/logr v0.2.1
99
github.com/google/gousb v0.0.0-20190812193832-18f4c1d8a750
1010
github.com/klauspost/cpuid v1.3.1
11-
github.com/onsi/ginkgo v1.12.1
12-
github.com/onsi/gomega v1.10.1
13-
github.com/pkg/errors v0.8.1
14-
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
15-
google.golang.org/grpc v1.26.0
11+
github.com/onsi/ginkgo v1.14.1
12+
github.com/onsi/gomega v1.10.2
13+
github.com/pkg/errors v0.9.1
14+
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
15+
google.golang.org/grpc v1.27.0
1616
gopkg.in/ini.v1 v1.46.0 // indirect
17-
k8s.io/api v0.18.6
18-
k8s.io/apimachinery v0.18.6
19-
k8s.io/client-go v0.18.6
20-
k8s.io/component-base v0.18.2
17+
k8s.io/api v0.19.3
18+
k8s.io/apimachinery v0.19.3
19+
k8s.io/client-go v0.19.3
20+
k8s.io/component-base v0.19.3
2121
k8s.io/klog v1.0.0
2222
k8s.io/kubelet v0.17.3
23-
k8s.io/kubernetes v1.18.2
24-
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
25-
sigs.k8s.io/controller-runtime v0.6.2
23+
k8s.io/kubernetes v1.19.3
24+
k8s.io/utils v0.0.0-20200912215256-4140de9c8800
25+
sigs.k8s.io/controller-runtime v0.7.0-alpha.6
2626
)
2727

2828
replace (
29-
k8s.io/api => k8s.io/api v0.18.2
30-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.2
31-
k8s.io/apimachinery => k8s.io/apimachinery v0.18.3-beta.0
32-
k8s.io/apiserver => k8s.io/apiserver v0.18.2
33-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.2
34-
k8s.io/client-go => k8s.io/client-go v0.18.2
35-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.2
36-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.2
37-
k8s.io/code-generator => k8s.io/code-generator v0.18.3-beta.0
38-
k8s.io/component-base => k8s.io/component-base v0.18.2
39-
k8s.io/cri-api => k8s.io/cri-api v0.18.3-beta.0
40-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.2
41-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.2
42-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.2
43-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.2
44-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.2
45-
k8s.io/kubectl => k8s.io/kubectl v0.18.2
46-
k8s.io/kubelet => k8s.io/kubelet v0.18.2
47-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.2
48-
k8s.io/metrics => k8s.io/metrics v0.18.2
29+
k8s.io/api => k8s.io/api v0.19.3
30+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.3
31+
k8s.io/apimachinery => k8s.io/apimachinery v0.19.4-rc.0
32+
k8s.io/apiserver => k8s.io/apiserver v0.19.3
33+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.3
34+
k8s.io/client-go => k8s.io/client-go v0.19.3
35+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.3
36+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.3
37+
k8s.io/code-generator => k8s.io/code-generator v0.19.4-rc.0
38+
k8s.io/component-base => k8s.io/component-base v0.19.3
39+
k8s.io/controller-manager => k8s.io/controller-manager v0.19.4-rc.0
40+
k8s.io/cri-api => k8s.io/cri-api v0.19.4-rc.0
41+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.3
42+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.3
43+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.3
44+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.3
45+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.3
46+
k8s.io/kubectl => k8s.io/kubectl v0.19.3
47+
k8s.io/kubelet => k8s.io/kubelet v0.19.3
48+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.3
49+
k8s.io/metrics => k8s.io/metrics v0.19.3
4950
k8s.io/node-api => k8s.io/node-api v0.17.3
50-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.2
51-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.2
52-
k8s.io/sample-controller => k8s.io/sample-controller v0.18.2
51+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.3
52+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.3
53+
k8s.io/sample-controller => k8s.io/sample-controller v0.19.3
5354
)

0 commit comments

Comments
 (0)