Skip to content

Commit

Permalink
refact(deps): bump k8s and client-go deps to version v0.20.2
Browse files Browse the repository at this point in the history 
Signed-off-by: prateekpandey14 <[email protected]>
  • Loading branch information
@prateekpandey14
prateekpandey14 committed Feb 25, 2021
1 parent 1c94fc0 commit 63de41b
Show file tree
Hide file tree
Showing 1,780 changed files with 190,441 additions and 150,939 deletions.
3 changes: 2 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ deps:
.PHONY: test
test:
go fmt ./...
go test $(PACKAGES)
@echo "--> Running go test" ;
@go test $(PACKAGES)

.PHONY: build
build:
Expand Down
68 changes: 32 additions & 36 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.13

require (
github.com/davecgh/go-spew v1.1.1
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/ghodss/yaml v1.0.0
github.com/hashicorp/go-version v1.2.1
github.com/imdario/mergo v0.3.8 // indirect
Expand All @@ -14,66 +13,63 @@ require (
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
github.com/stretchr/testify v1.6.1
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8
go.uber.org/zap v1.13.0
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/grpc v1.23.1
k8s.io/api v0.17.3
k8s.io/apimachinery v0.17.3
k8s.io/client-go v11.0.0+incompatible
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
google.golang.org/grpc v1.27.1
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.17.3
k8s.io/utils v0.0.0-20200124190032-861946025e34 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.17.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.3
github.com/openebs/api/v2 v2.2.0 => /home/prateek/gocode/src/github.com/openebs/api
k8s.io/api => k8s.io/api v0.20.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2

k8s.io/apimachinery => k8s.io/apimachinery v0.17.4-beta.0
k8s.io/apimachinery => k8s.io/apimachinery v0.20.2

k8s.io/apiserver => k8s.io/apiserver v0.17.3
k8s.io/apiserver => k8s.io/apiserver v0.20.2

k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2

k8s.io/client-go => k8s.io/client-go v0.17.3
k8s.io/client-go => k8s.io/client-go v0.20.2

k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2

k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2

k8s.io/code-generator => k8s.io/code-generator v0.17.4-beta.0
k8s.io/code-generator => k8s.io/code-generator v0.20.2

k8s.io/component-base => k8s.io/component-base v0.17.3
k8s.io/component-base => k8s.io/component-base v0.20.2
k8s.io/component-helpers => k8s.io/component-helpers v0.20.2
k8s.io/cri-api => k8s.io/cri-api v0.20.2

k8s.io/cri-api => k8s.io/cri-api v0.17.4-beta.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2

k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2

k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2

k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2

k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2

k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.3
k8s.io/kubectl => k8s.io/kubectl v0.20.2

k8s.io/kubectl => k8s.io/kubectl v0.17.3
k8s.io/kubelet => k8s.io/kubelet v0.20.2

k8s.io/kubelet => k8s.io/kubelet v0.17.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2

k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.3
k8s.io/metrics => k8s.io/metrics v0.20.2

k8s.io/metrics => k8s.io/metrics v0.17.3
k8s.io/node-api => k8s.io/node-api v0.20.2

k8s.io/node-api => k8s.io/node-api v0.17.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2

k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2

k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.3

k8s.io/sample-controller => k8s.io/sample-controller v0.17.3
k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
)
743 changes: 247 additions & 496 deletions go.sum
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions pkg/controllers/backup-controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package backupcontroller

import (
"context"
"os"

corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -183,7 +184,7 @@ func (c *BackupController) cleanupOldBackup() {
LabelSelector: bkplabel,
}

bkplist, err := c.clientset.CstorV1().CStorBackups(metav1.NamespaceAll).List(bkplistop)
bkplist, err := c.clientset.CstorV1().CStorBackups(metav1.NamespaceAll).List(context.TODO(), bkplistop)
if err != nil {
return
}
Expand All @@ -207,7 +208,7 @@ func (c *BackupController) cleanupOldBackup() {
func updateBackupStatus(clientset clientset.Interface, bkp cstorapis.CStorBackup, status cstorapis.CStorBackupStatus) {
bkp.Status = status

_, err := clientset.CstorV1().CStorBackups(bkp.Namespace).Update(&bkp)
_, err := clientset.CstorV1().CStorBackups(bkp.Namespace).Update(context.TODO(), &bkp, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("Failed to update backup(%s) status(%s)", status, bkp.Name)
return
Expand All @@ -220,7 +221,7 @@ func findLastBackupStat(clientset clientset.Interface, bkp cstorapis.CStorBackup

lastbkp, err := clientset.CstorV1().
CStorCompletedBackups(bkp.Namespace).
Get(lastbkpname, metav1.GetOptions{})
Get(context.TODO(), lastbkpname, metav1.GetOptions{})
if err != nil {
// Unable to fetch the last backup, so we will return fail state
klog.Errorf("Failed to fetch last completed backup:%s error:%s", lastbkpname, err.Error())
Expand Down
17 changes: 9 additions & 8 deletions pkg/controllers/backup-controller/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package backupcontroller

import (
"context"
"fmt"

cstorapis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
Expand Down Expand Up @@ -57,14 +58,14 @@ func (c *BackupController) syncHandler(key string, operation common.QueueOperati
return nil
}

nbkp, err := c.clientset.CstorV1().CStorBackups(bkp.Namespace).Get(bkp.Name, metav1.GetOptions{})
nbkp, err := c.clientset.CstorV1().CStorBackups(bkp.Namespace).Get(context.TODO(), bkp.Name, metav1.GetOptions{})
if err != nil {
return err
}

nbkp.Status = bkp.Status

_, err = c.clientset.CstorV1().CStorBackups(nbkp.Namespace).Update(nbkp)
_, err = c.clientset.CstorV1().CStorBackups(nbkp.Namespace).Update(context.TODO(), nbkp, metav1.UpdateOptions{})
if err != nil {
return err
}
Expand Down Expand Up @@ -103,7 +104,7 @@ func (c *BackupController) syncEventHandler(bkp *cstorapis.CStorBackup) (string,
// If the backup is in init state then only we will complete the backup
if bkp.IsInInit() {
bkp.Status = cstorapis.BKPCStorStatusInProgress
_, err := c.clientset.CstorV1().CStorBackups(bkp.Namespace).Update(bkp)
_, err := c.clientset.CstorV1().CStorBackups(bkp.Namespace).Update(context.TODO(), bkp, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("Failed to update backup:%s status : %v", bkp.Name, err.Error())
return "", err
Expand Down Expand Up @@ -136,7 +137,7 @@ func (c *BackupController) getCStorBackupResource(key string) (*cstorapis.CStorB
return nil, nil
}

bkp, err := c.clientset.CstorV1().CStorBackups(ns).Get(name, metav1.GetOptions{})
bkp, err := c.clientset.CstorV1().CStorBackups(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
runtime.HandleError(fmt.Errorf("bkp '%s' in work queue no longer exists", key))
Expand Down Expand Up @@ -168,7 +169,7 @@ func (c *BackupController) updateCStorCompletedBackup(bkp *cstorapis.CStorBackup
// cstor pools. In such cases if backup is for scheduled backup then and completed
// backup belongs to the pool that supports v1alpha1 then we have to update v1alpha1
// completed backup resource
completedBackup, err := c.clientset.OpenebsV1alpha1().CStorCompletedBackups(bkp.Namespace).Get(lastbkpname, metav1.GetOptions{})
completedBackup, err := c.clientset.OpenebsV1alpha1().CStorCompletedBackups(bkp.Namespace).Get(context.TODO(), lastbkpname, metav1.GetOptions{})
if err != nil && !k8serror.IsNotFound(err) {
klog.Errorf("failed to get completed backup for %s vol: %v error: %v", bkp.Spec.BackupName, bkp.Spec.VolumeName, err)
}
Expand All @@ -180,15 +181,15 @@ func (c *BackupController) updateCStorCompletedBackup(bkp *cstorapis.CStorBackup
// PrevSnapName store the name of last backed up snapshot<Paste>
completedBackup.Spec.PrevSnapName = bkp.Spec.SnapName

_, err = c.clientset.OpenebsV1alpha1().CStorCompletedBackups(bkp.Namespace).Update(completedBackup)
_, err = c.clientset.OpenebsV1alpha1().CStorCompletedBackups(bkp.Namespace).Update(context.TODO(), completedBackup, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("Failed to update lastbackup for %s", completedBackup.Name)
return err
}
return nil
}

bkplast, err := c.clientset.CstorV1().CStorCompletedBackups(bkp.Namespace).Get(lastbkpname, metav1.GetOptions{})
bkplast, err := c.clientset.CstorV1().CStorCompletedBackups(bkp.Namespace).Get(context.TODO(), lastbkpname, metav1.GetOptions{})
if err != nil {
klog.Errorf("Failed to get last completed backup for %s vol:%v error: %v", bkp.Spec.BackupName, bkp.Spec.VolumeName, err)
return nil
Expand All @@ -199,7 +200,7 @@ func (c *BackupController) updateCStorCompletedBackup(bkp *cstorapis.CStorBackup

// LastSnapName store the name of last backed up snapshot
bkplast.Spec.LastSnapName = bkp.Spec.SnapName
_, err = c.clientset.CstorV1().CStorCompletedBackups(bkp.Namespace).Update(bkplast)
_, err = c.clientset.CstorV1().CStorCompletedBackups(bkp.Namespace).Update(context.TODO(), bkplast, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("Failed to update lastbackup for %s", bkplast.Name)
return err
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/common/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package common

import (
"context"
"reflect"
"strings"
"sync"
Expand Down Expand Up @@ -205,7 +206,7 @@ func CheckForCStorVolumeReplicaCRD(clientset clientset.Interface) {
// or not, we are trying to handle only the error of CVR CR List api indirectly.
// CRD has only two types of scope, cluster and namespaced. If CR list api
// for default namespace works fine, then CR list api works for all namespaces.
_, err := clientset.CstorV1().CStorVolumeReplicas(string(DefaultNameSpace)).List(metav1.ListOptions{})
_, err := clientset.CstorV1().CStorVolumeReplicas(string(DefaultNameSpace)).List(context.TODO(), metav1.ListOptions{})
if err != nil {
klog.Errorf("CStorVolumeReplica CRD not found. Retrying after %v, error: %v", CRDRetryInterval, err)
time.Sleep(CRDRetryInterval)
Expand Down
9 changes: 6 additions & 3 deletions pkg/controllers/cspc-controller/cleanup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package cspccontroller

import (
"context"

apis "github.com/openebs/api/v2/pkg/apis/cstor/v1"
"github.com/openebs/api/v2/pkg/apis/types"

Expand Down Expand Up @@ -49,7 +51,7 @@ func (c *Controller) cleanupCSPIResources(cspiList *apis.CStorPoolInstanceList)
}

cspiObj.Finalizers = util.RemoveString(cspiObj.Finalizers, types.CSPCFinalizer)
_, err := c.GetStoredCStorVersionClient().CStorPoolInstances(cspiItem.Namespace).Update(&cspiObj)
_, err := c.GetStoredCStorVersionClient().CStorPoolInstances(cspiItem.Namespace).Update(context.TODO(), &cspiObj, metav1.UpdateOptions{})
if err != nil {
return errors.Wrapf(err, "failed to remove finalizer from cspi %s", cspiItem.Name)
}
Expand Down Expand Up @@ -113,6 +115,7 @@ type cspiCleanupOptions func(apis.CStorPoolInstance) error
// cleanupBDC deletes the BDCs for the CSPI which has been deleted or downscaled
func (c *Controller) cleanupBDC(cspiObj apis.CStorPoolInstance) error {
bdcList, err := c.GetStoredOpenebsVersionClient().BlockDeviceClaims(cspiObj.Namespace).List(
context.TODO(),
metav1.ListOptions{
LabelSelector: string(types.CStorPoolClusterLabelKey) + "=" + cspiObj.Labels[string(types.CStorPoolClusterLabelKey)],
},
Expand All @@ -131,11 +134,11 @@ func (c *Controller) cleanupBDC(cspiObj apis.CStorPoolInstance) error {
if cspiBDMap[bdcItem.Spec.BlockDeviceName] {
bdcObj := &bdcItem
bdcObj.Finalizers = util.RemoveString(bdcObj.Finalizers, types.CSPCFinalizer)
bdcObj, err = c.GetStoredOpenebsVersionClient().BlockDeviceClaims(cspiObj.Namespace).Update(bdcObj)
bdcObj, err = c.GetStoredOpenebsVersionClient().BlockDeviceClaims(cspiObj.Namespace).Update(context.TODO(), bdcObj, metav1.UpdateOptions{})
if err != nil {
return errors.Wrapf(err, "failed to remove finalizers from bdc %s", bdcItem.Name)
}
err = c.GetStoredOpenebsVersionClient().BlockDeviceClaims(cspiObj.Namespace).Delete(bdcObj.Name, &metav1.DeleteOptions{})
err = c.GetStoredOpenebsVersionClient().BlockDeviceClaims(cspiObj.Namespace).Delete(context.TODO(), bdcObj.Name, metav1.DeleteOptions{})
if err != nil {
return errors.Wrapf(err, "failed to delete bdc %s", bdcObj.Name)
}
Expand Down
9 changes: 5 additions & 4 deletions pkg/controllers/cspc-controller/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package cspccontroller

import (
"context"
"fmt"

"github.com/openebs/api/v2/pkg/apis/types"
Expand Down Expand Up @@ -107,8 +108,8 @@ func (c *Controller) enqueue(cspc *cstor.CStorPoolCluster) {
func (c *Controller) GetCSPIListForCSPC(cspc *cstor.CStorPoolCluster) (*cstor.CStorPoolInstanceList, error) {
return c.GetStoredCStorVersionClient().
CStorPoolInstances(cspc.Namespace).
List(metav1.
ListOptions{
LabelSelector: types.CStorPoolClusterLabelKey + "=" + cspc.Name,
})
List(context.TODO(),
metav1.ListOptions{
LabelSelector: types.CStorPoolClusterLabelKey + "=" + cspc.Name,
})
}
Loading

0 comments on commit 63de41b

Please sign in to comment.