Skip to content

Commit a405158

Browse files
authored
Merge pull request #221 from jimmidyson/kubernetes-1.12
✨ Update to Kubernetes 1.12.2
2 parents 9bfe5fd + 1705e84 commit a405158

File tree

359 files changed

+18190
-8085
lines changed

Some content is hidden

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

359 files changed

+18190
-8085
lines changed

Gopkg.lock

+24-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
2525

2626
[[constraint]]
2727
name = "k8s.io/api"
28-
version = "kubernetes-1.11.2"
28+
version = "kubernetes-1.12.2"
2929

3030
[[constraint]]
3131
name = "k8s.io/apiextensions-apiserver"
32-
version = "kubernetes-1.11.2"
32+
version = "kubernetes-1.12.2"
3333

3434
[[constraint]]
3535
name = "k8s.io/apimachinery"
36-
version = "kubernetes-1.11.2"
36+
version = "kubernetes-1.12.2"
3737

3838
[[constraint]]
3939
name = "k8s.io/client-go"
40-
version = "kubernetes-1.11.2"
40+
version = "kubernetes-1.12.2"
4141

4242
[[constraint]]
4343
name = "github.com/onsi/ginkgo"

pkg/client/unstructured_client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (uc *unstructuredClient) Create(_ context.Context, obj runtime.Object) erro
4646
if err != nil {
4747
return err
4848
}
49-
i, err := r.Create(u)
49+
i, err := r.Create(u, metav1.CreateOptions{})
5050
if err != nil {
5151
return err
5252
}
@@ -64,7 +64,7 @@ func (uc *unstructuredClient) Update(_ context.Context, obj runtime.Object) erro
6464
if err != nil {
6565
return err
6666
}
67-
i, err := r.Update(u)
67+
i, err := r.Update(u, metav1.UpdateOptions{})
6868
if err != nil {
6969
return err
7070
}
@@ -142,7 +142,7 @@ func (uc *unstructuredClient) UpdateStatus(_ context.Context, obj runtime.Object
142142
if err != nil {
143143
return err
144144
}
145-
i, err := r.UpdateStatus(u)
145+
i, err := r.UpdateStatus(u, metav1.UpdateOptions{})
146146
if err != nil {
147147
return err
148148
}

pkg/manager/internal.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ func (cm *controllerManager) startLeaderElection() (err error) {
270270
RenewDeadline: 10 * time.Second,
271271
RetryPeriod: 2 * time.Second,
272272
Callbacks: leaderelection.LeaderCallbacks{
273-
OnStartedLeading: func(_ <-chan struct{}) {
273+
OnStartedLeading: func(_ context.Context) {
274274
cm.start()
275275
},
276276
OnStoppedLeading: func() {
@@ -286,6 +286,6 @@ func (cm *controllerManager) startLeaderElection() (err error) {
286286
}
287287

288288
// Start the leader elector process
289-
go l.Run()
289+
go l.Run(context.Background())
290290
return nil
291291
}

pkg/runtime/scheme/scheme_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var _ = Describe("Scheme", func() {
3737
Build()
3838
Expect(err).NotTo(HaveOccurred())
3939

40-
Expect(s.AllKnownTypes()).To(HaveLen(13))
40+
Expect(s.AllKnownTypes()).To(HaveLen(15))
4141
Expect(s.AllKnownTypes()[gv.WithKind("Pod")]).To(Equal(reflect.TypeOf(corev1.Pod{})))
4242
Expect(s.AllKnownTypes()[gv.WithKind("PodList")]).To(Equal(reflect.TypeOf(corev1.PodList{})))
4343

@@ -71,7 +71,7 @@ var _ = Describe("Scheme", func() {
7171
Build()
7272

7373
Expect(err).NotTo(HaveOccurred())
74-
Expect(s.AllKnownTypes()).To(HaveLen(21))
74+
Expect(s.AllKnownTypes()).To(HaveLen(25))
7575

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

0 commit comments

Comments
 (0)