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

✨ Update to Kubernetes 1.12.2 #221

Merged
merged 2 commits into from
Dec 1, 2018
Merged

✨ Update to Kubernetes 1.12.2 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8190265
Update dependencies to Kubernetes 1.12.2
jimmidyson Nov 22, 2018
1705e84
Update code to work with new Kubernetes 1.12.2 dependencies
jimmidyson Nov 22, 2018
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
  •  
  •  
  •  
36 changes: 24 additions & 12 deletions Gopkg.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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{})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@droot we'll want to surface create options somewhere in our client at some point

if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/manager/internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we'll want to surface this too

cm.start()
},
OnStoppedLeading: func() {
Expand All @@ -284,6 +284,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
View file
Open in desktop
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