Skip to content

Commit

Permalink
Merge pull request #221 from jimmidyson/kubernetes-1.12
Browse files Browse the repository at this point in the history
✨ Update to Kubernetes 1.12.2
  • Loading branch information
k8s-ci-robot committed Dec 1, 2018
2 parents 9bfe5fd + 1705e84 commit a405158
Show file tree
Hide file tree
Showing 359 changed files with 18,190 additions and 8,085 deletions.
36 changes: 24 additions & 12 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ required = ["sigs.k8s.io/testing_frameworks/integration",

[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.11.2"
version = "kubernetes-1.12.2"

[[constraint]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.11.2"
version = "kubernetes-1.12.2"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.11.2"
version = "kubernetes-1.12.2"

[[constraint]]
name = "k8s.io/client-go"
version = "kubernetes-1.11.2"
version = "kubernetes-1.12.2"

[[constraint]]
name = "github.com/onsi/ginkgo"
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/unstructured_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (uc *unstructuredClient) Create(_ context.Context, obj runtime.Object) erro
if err != nil {
return err
}
i, err := r.Create(u)
i, err := r.Create(u, metav1.CreateOptions{})
if err != nil {
return err
}
Expand All @@ -64,7 +64,7 @@ func (uc *unstructuredClient) Update(_ context.Context, obj runtime.Object) erro
if err != nil {
return err
}
i, err := r.Update(u)
i, err := r.Update(u, metav1.UpdateOptions{})
if err != nil {
return err
}
Expand Down Expand Up @@ -142,7 +142,7 @@ func (uc *unstructuredClient) UpdateStatus(_ context.Context, obj runtime.Object
if err != nil {
return err
}
i, err := r.UpdateStatus(u)
i, err := r.UpdateStatus(u, metav1.UpdateOptions{})
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/manager/internal.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func (cm *controllerManager) startLeaderElection() (err error) {
RenewDeadline: 10 * time.Second,
RetryPeriod: 2 * time.Second,
Callbacks: leaderelection.LeaderCallbacks{
OnStartedLeading: func(_ <-chan struct{}) {
OnStartedLeading: func(_ context.Context) {
cm.start()
},
OnStoppedLeading: func() {
Expand All @@ -286,6 +286,6 @@ func (cm *controllerManager) startLeaderElection() (err error) {
}

// Start the leader elector process
go l.Run()
go l.Run(context.Background())
return nil
}
4 changes: 2 additions & 2 deletions pkg/runtime/scheme/scheme_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var _ = Describe("Scheme", func() {
Build()
Expect(err).NotTo(HaveOccurred())

Expect(s.AllKnownTypes()).To(HaveLen(13))
Expect(s.AllKnownTypes()).To(HaveLen(15))
Expect(s.AllKnownTypes()[gv.WithKind("Pod")]).To(Equal(reflect.TypeOf(corev1.Pod{})))
Expect(s.AllKnownTypes()[gv.WithKind("PodList")]).To(Equal(reflect.TypeOf(corev1.PodList{})))

Expand Down Expand Up @@ -71,7 +71,7 @@ var _ = Describe("Scheme", func() {
Build()

Expect(err).NotTo(HaveOccurred())
Expect(s.AllKnownTypes()).To(HaveLen(21))
Expect(s.AllKnownTypes()).To(HaveLen(25))

// Types from b1
Expect(s.AllKnownTypes()[gv1.WithKind("Pod")]).To(Equal(reflect.TypeOf(corev1.Pod{})))
Expand Down
Loading

0 comments on commit a405158

Please sign in to comment.