Skip to content

Commit 212a105

Browse files
volcano-sh-botvolcano-sh-bot
authored
Merge pull request #855 from hzxuzhonghu/k8s-dep
Bump to k8s 1.18.3
2 parents 71d6cb7 + 189d4e1 commit 212a105

File tree

1,434 files changed

+76734
-44637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,434 files changed

+76734
-44637
lines changed

‎cmd/webhook-manager/app/util.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package app
1818

1919
import (
20+
"context"
2021
"crypto/tls"
2122
"regexp"
2223
"strings"
@@ -131,19 +132,19 @@ func configTLS(config *options.Config, restConfig *rest.Config) *tls.Config {
131132

132133
func registerMutateWebhook(clientset *kubernetes.Clientset, hook *v1beta1.MutatingWebhookConfiguration) error {
133134
client := clientset.AdmissionregistrationV1beta1().MutatingWebhookConfigurations()
134-
existing, err := client.Get(hook.Name, metav1.GetOptions{})
135+
existing, err := client.Get(context.TODO(), hook.Name, metav1.GetOptions{})
135136
if err != nil && !apierrors.IsNotFound(err) {
136137
return err
137138
}
138139
if err == nil && existing != nil {
139140
klog.V(4).Infof("Updating MutatingWebhookConfiguration %v", hook)
140141
existing.Webhooks = hook.Webhooks
141-
if _, err := client.Update(existing); err != nil {
142+
if _, err := client.Update(context.TODO(), existing, metav1.UpdateOptions{}); err != nil {
142143
return err
143144
}
144145
} else {
145146
klog.V(4).Infof("Creating MutatingWebhookConfiguration %v", hook)
146-
if _, err := client.Create(hook); err != nil {
147+
if _, err := client.Create(context.TODO(), hook, metav1.CreateOptions{}); err != nil {
147148
return err
148149
}
149150
}
@@ -154,19 +155,19 @@ func registerMutateWebhook(clientset *kubernetes.Clientset, hook *v1beta1.Mutati
154155
func registerValidateWebhook(clientset *kubernetes.Clientset, hook *v1beta1.ValidatingWebhookConfiguration) error {
155156
client := clientset.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations()
156157

157-
existing, err := client.Get(hook.Name, metav1.GetOptions{})
158+
existing, err := client.Get(context.TODO(), hook.Name, metav1.GetOptions{})
158159
if err != nil && !apierrors.IsNotFound(err) {
159160
return err
160161
}
161162
if err == nil && existing != nil {
162163
existing.Webhooks = hook.Webhooks
163164
klog.V(4).Infof("Updating ValidatingWebhookConfiguration %v", hook)
164-
if _, err := client.Update(existing); err != nil {
165+
if _, err := client.Update(context.TODO(), existing, metav1.UpdateOptions{}); err != nil {
165166
return err
166167
}
167168
} else {
168169
klog.V(4).Infof("Creating ValidatingWebhookConfiguration %v", hook)
169-
if _, err := client.Create(hook); err != nil {
170+
if _, err := client.Create(context.TODO(), hook, metav1.CreateOptions{}); err != nil {
170171
return err
171172
}
172173
}

‎example/kubecon-2019-china/scripts/node-info.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56

67
v1 "k8s.io/api/core/v1"
@@ -18,11 +19,11 @@ func main() {
1819
panic(err)
1920
}
2021
kubeClient := kubernetes.NewForConfigOrDie(config)
21-
nodes, err := kubeClient.CoreV1().Nodes().List(metav1.ListOptions{})
22+
nodes, err := kubeClient.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
2223
if err != nil {
2324
panic(err)
2425
}
25-
pods, err := kubeClient.CoreV1().Pods("").List(metav1.ListOptions{})
26+
pods, err := kubeClient.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
2627
if err != nil {
2728
panic(err)
2829
}

‎go.mod

+38-41
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,52 @@ module volcano.sh/volcano
22

33
go 1.13
44

5-
replace (
6-
k8s.io/api => k8s.io/api v0.0.0-20200131112707-d64dbec685a4
7-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20200318010308-c96942bf1b43
8-
k8s.io/apimachinery => k8s.io/apimachinery v0.16.9-beta.0
9-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20200317213526-62c18ca8f66b
10-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200228051546-a99b7f303206
11-
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
12-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200228053305-d368059ead1c
13-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20200228053038-8bbe56c26119
14-
k8s.io/code-generator => k8s.io/code-generator v0.16.9-beta.0
15-
k8s.io/component-base => k8s.io/component-base v0.16.9-beta.0
16-
k8s.io/cri-api => k8s.io/cri-api v0.16.9-beta.0
17-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200228053533-d83d9540380e
18-
k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505
19-
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
20-
k8s.io/klog => k8s.io/klog v0.4.0
21-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20200228045702-699a8508e8d2
22-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20200228052810-d1f697fa5379
23-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
24-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20200228052049-a6119a74791a
25-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20200228052541-0195892e09a0
26-
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20200228054512-419760c9116d
27-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4
28-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20200317194326-32f35d4b17b4
29-
k8s.io/metrics => k8s.io/metrics v0.0.0-20200228051301-c298383a72cb
30-
k8s.io/node-api => k8s.io/node-api v0.0.0-20200228054017-076d0760c5f1
31-
k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3
32-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20200228050048-9291aec797aa
33-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20200228051820-6fc9c909879b
34-
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20200228050512-c37f031c4cf9
35-
)
36-
375
require (
386
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
397
github.com/hashicorp/go-multierror v1.0.0
40-
github.com/onsi/ginkgo v1.10.1
8+
github.com/onsi/ginkgo v1.11.0
419
github.com/onsi/gomega v1.7.0
42-
github.com/prometheus/client_golang v0.9.2
10+
github.com/prometheus/client_golang v1.0.0
4311
github.com/spf13/cobra v0.0.5
4412
github.com/spf13/pflag v1.0.5
4513
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
4614
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
4715
gopkg.in/yaml.v2 v2.2.8
48-
k8s.io/api v0.0.0
49-
k8s.io/apimachinery v0.16.9-beta.0
50-
k8s.io/apiserver v0.0.0
51-
k8s.io/client-go v0.16.9-beta.0
52-
k8s.io/component-base v0.0.0
16+
k8s.io/api v0.18.3
17+
k8s.io/apimachinery v0.18.3
18+
k8s.io/apiserver v0.18.3
19+
k8s.io/client-go v0.18.3
20+
k8s.io/component-base v0.18.3
5321
k8s.io/klog v1.0.0
54-
k8s.io/kubernetes v1.16.2
55-
sigs.k8s.io/yaml v1.1.0
22+
k8s.io/kube-scheduler v0.0.0
23+
k8s.io/kubernetes v1.18.3
24+
sigs.k8s.io/yaml v1.2.0
25+
)
26+
27+
replace (
28+
k8s.io/api => k8s.io/api v0.18.3
29+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.3
30+
k8s.io/apimachinery => k8s.io/apimachinery v0.18.3
31+
k8s.io/apiserver => k8s.io/apiserver v0.18.3
32+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.3
33+
k8s.io/client-go => k8s.io/client-go v0.18.3
34+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.3
35+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.3
36+
k8s.io/code-generator => k8s.io/code-generator v0.18.3
37+
k8s.io/component-base => k8s.io/component-base v0.18.3
38+
k8s.io/cri-api => k8s.io/cri-api v0.18.3
39+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.3
40+
k8s.io/klog => k8s.io/klog v1.0.0
41+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.3
42+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.3
43+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.3
44+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.3
45+
k8s.io/kubectl => k8s.io/kubectl v0.18.3
46+
k8s.io/kubelet => k8s.io/kubelet v0.18.3
47+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.3
48+
k8s.io/metrics => k8s.io/metrics v0.18.3
49+
k8s.io/node-api => k8s.io/node-api v0.18.3
50+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.3
51+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.3
52+
k8s.io/sample-controller => k8s.io/sample-controller v0.18.3
5653
)

0 commit comments

Comments
 (0)