scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix pkg/controller/deployment staticcheck

Browse Source
This commit is contained in:
wawa0210
2020-06-23 19:32:20 +08:00
parent db8a88721e
commit 7d8aae51df
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@@ -1,5 +1,4 @@
cluster/images/etcd/migrate cluster/images/etcd/migrate
pkg/controller/deployment
pkg/controller/garbagecollector pkg/controller/garbagecollector
pkg/controller/nodeipam pkg/controller/nodeipam
pkg/controller/podautoscaler pkg/controller/podautoscaler

18
pkg/controller/deployment/deployment_controller.go
View File

@@ -182,12 +182,12 @@ func (dc *DeploymentController) deleteDeployment(obj interface{}) {
if !ok { if !ok {
tombstone, ok := obj.(cache.DeletedFinalStateUnknown) tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok { if !ok {
utilruntime.HandleError(fmt.Errorf("Couldn't get object from tombstone %#v", obj)) utilruntime.HandleError(fmt.Errorf("couldn't get object from tombstone %#v", obj))
return return
} }
d, ok = tombstone.Obj.(*apps.Deployment) d, ok = tombstone.Obj.(*apps.Deployment)
if !ok { if !ok {
utilruntime.HandleError(fmt.Errorf("Tombstone contained object that is not a Deployment %#v", obj)) utilruntime.HandleError(fmt.Errorf("tombstone contained object that is not a Deployment %#v", obj))
return return
} }
} }
@@ -311,12 +311,12 @@ func (dc *DeploymentController) deleteReplicaSet(obj interface{}) {
if !ok { if !ok {
tombstone, ok := obj.(cache.DeletedFinalStateUnknown) tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok { if !ok {
utilruntime.HandleError(fmt.Errorf("Couldn't get object from tombstone %#v", obj)) utilruntime.HandleError(fmt.Errorf("couldn't get object from tombstone %#v", obj))
return return
} }
rs, ok = tombstone.Obj.(*apps.ReplicaSet) rs, ok = tombstone.Obj.(*apps.ReplicaSet)
if !ok { if !ok {
utilruntime.HandleError(fmt.Errorf("Tombstone contained object that is not a ReplicaSet %#v", obj)) utilruntime.HandleError(fmt.Errorf("tombstone contained object that is not a ReplicaSet %#v", obj))
return return
} }
} }
@@ -345,12 +345,12 @@ func (dc *DeploymentController) deletePod(obj interface{}) {
if !ok { if !ok {
tombstone, ok := obj.(cache.DeletedFinalStateUnknown) tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok { if !ok {
utilruntime.HandleError(fmt.Errorf("Couldn't get object from tombstone %#v", obj)) utilruntime.HandleError(fmt.Errorf("couldn't get object from tombstone %#v", obj))
return return
} }
pod, ok = tombstone.Obj.(*v1.Pod) pod, ok = tombstone.Obj.(*v1.Pod)
if !ok { if !ok {
utilruntime.HandleError(fmt.Errorf("Tombstone contained object that is not a pod %#v", obj)) utilruntime.HandleError(fmt.Errorf("tombstone contained object that is not a pod %#v", obj))
return return
} }
} }
@@ -378,7 +378,7 @@ func (dc *DeploymentController) deletePod(obj interface{}) {
func (dc *DeploymentController) enqueue(deployment *apps.Deployment) { func (dc *DeploymentController) enqueue(deployment *apps.Deployment) {
key, err := controller.KeyFunc(deployment) key, err := controller.KeyFunc(deployment)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %#v: %v", deployment, err)) utilruntime.HandleError(fmt.Errorf("couldn't get key for object %#v: %v", deployment, err))
return return
} }
@@ -388,7 +388,7 @@ func (dc *DeploymentController) enqueue(deployment *apps.Deployment) {
func (dc *DeploymentController) enqueueRateLimited(deployment *apps.Deployment) { func (dc *DeploymentController) enqueueRateLimited(deployment *apps.Deployment) {
key, err := controller.KeyFunc(deployment) key, err := controller.KeyFunc(deployment)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %#v: %v", deployment, err)) utilruntime.HandleError(fmt.Errorf("couldn't get key for object %#v: %v", deployment, err))
return return
} }
@@ -399,7 +399,7 @@ func (dc *DeploymentController) enqueueRateLimited(deployment *apps.Deployment)
func (dc *DeploymentController) enqueueAfter(deployment *apps.Deployment, after time.Duration) { func (dc *DeploymentController) enqueueAfter(deployment *apps.Deployment, after time.Duration) {
key, err := controller.KeyFunc(deployment) key, err := controller.KeyFunc(deployment)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %#v: %v", deployment, err)) utilruntime.HandleError(fmt.Errorf("couldn't get key for object %#v: %v", deployment, err))
return return
} }

4
pkg/controller/deployment/sync.go
View File

@@ -98,7 +98,7 @@ func (dc *DeploymentController) checkPausedConditions(d *apps.Deployment) error
} }
var err error var err error
d, err = dc.client.AppsV1().Deployments(d.Namespace).UpdateStatus(context.TODO(), d, metav1.UpdateOptions{}) _, err = dc.client.AppsV1().Deployments(d.Namespace).UpdateStatus(context.TODO(), d, metav1.UpdateOptions{})
return err return err
} }
@@ -173,7 +173,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *apps.Deployment, rsList, old
if needsUpdate { if needsUpdate {
var err error var err error
if d, err = dc.client.AppsV1().Deployments(d.Namespace).UpdateStatus(context.TODO(), d, metav1.UpdateOptions{}); err != nil { if _, err = dc.client.AppsV1().Deployments(d.Namespace).UpdateStatus(context.TODO(), d, metav1.UpdateOptions{}); err != nil {
return nil, err return nil, err
} }
} }