Skip to content

Commit

Permalink
Update client libraries to 1.14 (#6029)
Browse files Browse the repository at this point in the history
* Upgrade the K8 libraries to v1.14

* Change non-versioned interface getters

* Sync

* Revert import order change

* Resolve conflict

* Fix the remaining
  • Loading branch information
Hakan Memisoglu authored and Ilya Kislenko committed Jul 11, 2019
1 parent 9676982 commit 2f21fcb
Show file tree
Hide file tree
Showing 27 changed files with 109 additions and 99 deletions.
66 changes: 38 additions & 28 deletions glide.lock

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

12 changes: 6 additions & 6 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import:
- package: github.com/jpillora/backoff
version: 1.0.0
- package: github.com/kubernetes-csi/external-snapshotter
version: v1.0.1
version: v1.1.0
- package: github.com/Masterminds/sprig
version: v2.15.0
- package: github.com/mitchellh/mapstructure
Expand Down Expand Up @@ -52,14 +52,14 @@ import:
version: v2
repo: https://github.com/go-tomb/tomb.git
- package: k8s.io/api
version: kubernetes-1.13.3
version: kubernetes-1.14.4
- package: k8s.io/apiextensions-apiserver
version: kubernetes-1.13.3
version: kubernetes-1.14.4
- package: k8s.io/apimachinery
version: kubernetes-1.13.3
version: kubernetes-1.14.4
- package: k8s.io/client-go
version: kubernetes-1.13.3
version: kubernetes-1.14.4
- package: k8s.io/code-generator
version: kubernetes-1.13.3
version: kubernetes-1.14.4
- package: k8s.io/gengo
version: 0689ccc1d7d65d9dd1bedcc3b0b1ed7df91ba266
8 changes: 4 additions & 4 deletions pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"
"time"

"github.com/pkg/errors"
. "gopkg.in/check.v1"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/core/v1"
Expand All @@ -22,7 +23,6 @@ import (
"github.com/kanisterio/kanister/pkg/poll"
"github.com/kanisterio/kanister/pkg/resource"
"github.com/kanisterio/kanister/pkg/testutil"
"github.com/pkg/errors"
)

// Hook up gocheck into the "go test" runner.
Expand Down Expand Up @@ -62,12 +62,12 @@ func (s *ControllerSuite) SetUpSuite(c *C) {
GenerateName: "kanistercontrollertest-",
},
}
cns, err := s.cli.Core().Namespaces().Create(ns)
cns, err := s.cli.CoreV1().Namespaces().Create(ns)
c.Assert(err, IsNil)
s.namespace = cns.Name

sec := testutil.NewTestProfileSecret()
sec, err = s.cli.Core().Secrets(s.namespace).Create(sec)
sec, err = s.cli.CoreV1().Secrets(s.namespace).Create(sec)
c.Assert(err, IsNil)

p := testutil.NewTestProfile(s.namespace, sec.GetName())
Expand All @@ -93,7 +93,7 @@ func (s *ControllerSuite) SetUpSuite(c *C) {

func (s *ControllerSuite) TearDownSuite(c *C) {
if s.namespace != "" {
s.cli.Core().Namespaces().Delete(s.namespace, nil)
s.cli.CoreV1().Namespaces().Delete(s.namespace, nil)
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/eventer/event_recorder.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func NewEventRecorder(client kubernetes.Interface, component string) record.Even
broadcaster := record.NewBroadcaster()
broadcaster.StartEventWatcher(
func(event *core.Event) {
if _, err := client.Core().Events(event.Namespace).Create(event); err != nil {
if _, err := client.CoreV1().Events(event.Namespace).Create(event); err != nil {
log.Errorf("Error while creating the event: %#v", err)
}
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/function/create_volume_from_snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func createVolumeFromSnapshot(ctx context.Context, cli kubernetes.Interface, nam
if err != nil {
return nil, errors.Wrapf(err, "Could not get storage provider %v", pvcInfo.Type)
}
_, err = cli.Core().PersistentVolumeClaims(namespace).Get(pvcName, metav1.GetOptions{})
_, err = cli.CoreV1().PersistentVolumeClaims(namespace).Get(pvcName, metav1.GetOptions{})
if err == nil {
if err = kubevolume.DeletePVC(cli, namespace, pvcName); err != nil {
return nil, err
Expand Down
8 changes: 4 additions & 4 deletions pkg/function/create_volume_from_snapshot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ func (s *CreateVolumeFromSnapshotTestSuite) TestCreateVolumeFromSnapshot(c *C) {
c.Assert(len(provider.(*mockblockstorage.Provider).VolIDList) == 1, Equals, true)

if tc.newPVCs != nil {
_, err = cli.Core().PersistentVolumeClaims(ns).Get("newpvc-1", metav1.GetOptions{})
_, err = cli.CoreV1().PersistentVolumeClaims(ns).Get("newpvc-1", metav1.GetOptions{})
c.Assert(err, IsNil)
_, err = cli.Core().PersistentVolumeClaims(ns).Get("newpvc-2", metav1.GetOptions{})
_, err = cli.CoreV1().PersistentVolumeClaims(ns).Get("newpvc-2", metav1.GetOptions{})
c.Assert(err, IsNil)
} else {
_, err = cli.Core().PersistentVolumeClaims(ns).Get("pvc-1", metav1.GetOptions{})
_, err = cli.CoreV1().PersistentVolumeClaims(ns).Get("pvc-1", metav1.GetOptions{})
c.Assert(err, IsNil)
_, err = cli.Core().PersistentVolumeClaims(ns).Get("pvc-2", metav1.GetOptions{})
_, err = cli.CoreV1().PersistentVolumeClaims(ns).Get("pvc-2", metav1.GetOptions{})
c.Assert(err, IsNil)
}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/function/create_volume_snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,15 @@ func getPVCInfo(ctx context.Context, kubeCli kubernetes.Interface, namespace str
_ = ctx
var region string
var provider blockstorage.Provider
pvc, err := kubeCli.Core().PersistentVolumeClaims(namespace).Get(name, metav1.GetOptions{})
pvc, err := kubeCli.CoreV1().PersistentVolumeClaims(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return nil, errors.Wrapf(err, "Failed to get PVC, PVC name: %s, namespace: %s", name, namespace)
}
pvName := pvc.Spec.VolumeName
if pvName == "" {
return nil, errors.Errorf("PVC %s in namespace %s not bound", name, namespace)
}
pv, err := kubeCli.Core().PersistentVolumes().Get(pvName, metav1.GetOptions{})
pv, err := kubeCli.CoreV1().PersistentVolumes().Get(pvName, metav1.GetOptions{})
if err != nil {
return nil, errors.Wrapf(err, "Failed to get PV %s, namespace: %s", pvName, namespace)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/function/create_volume_snapshot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ func (s *CreateVolumeSnapshotTestSuite) TestGetPVCInfo(c *C) {
},
},
)
_, err := cli.Core().PersistentVolumeClaims(ns).Get("pvc-test-1", metav1.GetOptions{})
_, err := cli.CoreV1().PersistentVolumeClaims(ns).Get("pvc-test-1", metav1.GetOptions{})
c.Assert(err, IsNil)
_, err = cli.Core().PersistentVolumes().Get("pv-test-1", metav1.GetOptions{})
_, err = cli.CoreV1().PersistentVolumes().Get("pv-test-1", metav1.GetOptions{})
c.Assert(err, IsNil)

for _, tc := range []struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/function/data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ func (s *DataSuite) SetUpSuite(c *C) {
ns := testutil.NewTestNamespace()
ns.GenerateName = "kanister-datatest-"

cns, err := s.cli.Core().Namespaces().Create(ns)
cns, err := s.cli.CoreV1().Namespaces().Create(ns)
c.Assert(err, IsNil)
s.namespace = cns.GetName()

sec := testutil.NewTestProfileSecret()
sec, err = s.cli.Core().Secrets(s.namespace).Create(sec)
sec, err = s.cli.CoreV1().Secrets(s.namespace).Create(sec)
c.Assert(err, IsNil)

p := testutil.NewTestProfile(s.namespace, sec.GetName())
Expand Down Expand Up @@ -90,7 +90,7 @@ func (s *DataSuite) TearDownSuite(c *C) {
c.Assert(err, IsNil)
}
if s.namespace != "" {
s.cli.Core().Namespaces().Delete(s.namespace, nil)
s.cli.CoreV1().Namespaces().Delete(s.namespace, nil)
}
}

Expand Down
Loading

0 comments on commit 2f21fcb

Please sign in to comment.