Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to k8s 1.18.3 #855

Merged
merged 8 commits into from
Jun 11, 2020
Merged

Bump to k8s 1.18.3 #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
359f747
Bum k8s dependency to 1.18.3
hzxuzhonghu Jun 11, 2020
049da37
auto gen
hzxuzhonghu Jun 11, 2020
4d5b5ca
auto gen
hzxuzhonghu Jun 11, 2020
fe29d14
Fix cli
hzxuzhonghu Jun 11, 2020
6fb9c04
fix controller
hzxuzhonghu Jun 11, 2020
fb4b328
fix admission
hzxuzhonghu Jun 11, 2020
511e0a5
Fix scheduler
hzxuzhonghu Jun 11, 2020
189d4e1
Fix e2e
hzxuzhonghu Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 7 additions & 6 deletions cmd/webhook-manager/app/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package app

import (
"context"
"crypto/tls"
"regexp"
"strings"
Expand Down Expand Up @@ -131,19 +132,19 @@ func configTLS(config *options.Config, restConfig *rest.Config) *tls.Config {

func registerMutateWebhook(clientset *kubernetes.Clientset, hook *v1beta1.MutatingWebhookConfiguration) error {
client := clientset.AdmissionregistrationV1beta1().MutatingWebhookConfigurations()
existing, err := client.Get(hook.Name, metav1.GetOptions{})
existing, err := client.Get(context.TODO(), hook.Name, metav1.GetOptions{})
if err != nil && !apierrors.IsNotFound(err) {
return err
}
if err == nil && existing != nil {
klog.V(4).Infof("Updating MutatingWebhookConfiguration %v", hook)
existing.Webhooks = hook.Webhooks
if _, err := client.Update(existing); err != nil {
if _, err := client.Update(context.TODO(), existing, metav1.UpdateOptions{}); err != nil {
return err
}
} else {
klog.V(4).Infof("Creating MutatingWebhookConfiguration %v", hook)
if _, err := client.Create(hook); err != nil {
if _, err := client.Create(context.TODO(), hook, metav1.CreateOptions{}); err != nil {
return err
}
}
Expand All @@ -154,19 +155,19 @@ func registerMutateWebhook(clientset *kubernetes.Clientset, hook *v1beta1.Mutati
func registerValidateWebhook(clientset *kubernetes.Clientset, hook *v1beta1.ValidatingWebhookConfiguration) error {
client := clientset.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations()

existing, err := client.Get(hook.Name, metav1.GetOptions{})
existing, err := client.Get(context.TODO(), hook.Name, metav1.GetOptions{})
if err != nil && !apierrors.IsNotFound(err) {
return err
}
if err == nil && existing != nil {
existing.Webhooks = hook.Webhooks
klog.V(4).Infof("Updating ValidatingWebhookConfiguration %v", hook)
if _, err := client.Update(existing); err != nil {
if _, err := client.Update(context.TODO(), existing, metav1.UpdateOptions{}); err != nil {
return err
}
} else {
klog.V(4).Infof("Creating ValidatingWebhookConfiguration %v", hook)
if _, err := client.Create(hook); err != nil {
if _, err := client.Create(context.TODO(), hook, metav1.CreateOptions{}); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions example/kubecon-2019-china/scripts/node-info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"context"
"fmt"

v1 "k8s.io/api/core/v1"
Expand All @@ -18,11 +19,11 @@ func main() {
panic(err)
}
kubeClient := kubernetes.NewForConfigOrDie(config)
nodes, err := kubeClient.CoreV1().Nodes().List(metav1.ListOptions{})
nodes, err := kubeClient.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
panic(err)
}
pods, err := kubeClient.CoreV1().Pods("").List(metav1.ListOptions{})
pods, err := kubeClient.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
panic(err)
}
Expand Down
79 changes: 38 additions & 41 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,52 @@ module volcano.sh/volcano

go 1.13

replace (
k8s.io/api => k8s.io/api v0.0.0-20200131112707-d64dbec685a4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20200318010308-c96942bf1b43
k8s.io/apimachinery => k8s.io/apimachinery v0.16.9-beta.0
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20200317213526-62c18ca8f66b
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200228051546-a99b7f303206
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200228053305-d368059ead1c
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20200228053038-8bbe56c26119
k8s.io/code-generator => k8s.io/code-generator v0.16.9-beta.0
k8s.io/component-base => k8s.io/component-base v0.16.9-beta.0
k8s.io/cri-api => k8s.io/cri-api v0.16.9-beta.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200228053533-d83d9540380e
k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.4.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20200228045702-699a8508e8d2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20200228052810-d1f697fa5379
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20200228052049-a6119a74791a
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20200228052541-0195892e09a0
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20200228054512-419760c9116d
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20200317194326-32f35d4b17b4
k8s.io/metrics => k8s.io/metrics v0.0.0-20200228051301-c298383a72cb
k8s.io/node-api => k8s.io/node-api v0.0.0-20200228054017-076d0760c5f1
k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20200228050048-9291aec797aa
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20200228051820-6fc9c909879b
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20200228050512-c37f031c4cf9
)

require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/go-multierror v1.0.0
github.com/onsi/ginkgo v1.10.1
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.7.0
github.com/prometheus/client_golang v0.9.2
github.com/prometheus/client_golang v1.0.0
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.16.9-beta.0
k8s.io/apiserver v0.0.0
k8s.io/client-go v0.16.9-beta.0
k8s.io/component-base v0.0.0
k8s.io/api v0.18.3
k8s.io/apimachinery v0.18.3
k8s.io/apiserver v0.18.3
k8s.io/client-go v0.18.3
k8s.io/component-base v0.18.3
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.16.2
sigs.k8s.io/yaml v1.1.0
k8s.io/kube-scheduler v0.0.0
k8s.io/kubernetes v1.18.3
sigs.k8s.io/yaml v1.2.0
)

replace (
k8s.io/api => k8s.io/api v0.18.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.3
k8s.io/apimachinery => k8s.io/apimachinery v0.18.3
k8s.io/apiserver => k8s.io/apiserver v0.18.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.3
k8s.io/client-go => k8s.io/client-go v0.18.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.3
k8s.io/code-generator => k8s.io/code-generator v0.18.3
k8s.io/component-base => k8s.io/component-base v0.18.3
k8s.io/cri-api => k8s.io/cri-api v0.18.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.3
k8s.io/klog => k8s.io/klog v1.0.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.3
k8s.io/kubectl => k8s.io/kubectl v0.18.3
k8s.io/kubelet => k8s.io/kubelet v0.18.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.3
k8s.io/metrics => k8s.io/metrics v0.18.3
k8s.io/node-api => k8s.io/node-api v0.18.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.3
k8s.io/sample-controller => k8s.io/sample-controller v0.18.3
)
Loading