Skip to content

Commit 23ec5f5

Browse files
deliahudeliahu
committed
Update k8s error checking
1 parent 0fafdbe commit 23ec5f5

File tree

9 files changed

+54
-55
lines changed

9 files changed

+54
-55
lines changed

‎pkg/lib/k8s/configmap.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ func (c *Client) ApplyConfigMap(configMap *kcore.ConfigMap) (*kcore.ConfigMap, e
8282

8383
func (c *Client) GetConfigMap(name string) (*kcore.ConfigMap, error) {
8484
configMap, err := c.configMapClient.Get(context.Background(), name, kmeta.GetOptions{})
85-
if kerrors.IsNotFound(err) {
86-
return nil, nil
87-
}
8885
if err != nil {
86+
if kerrors.IsNotFound(err) {
87+
return nil, nil
88+
}
8989
return nil, errors.WithStack(err)
9090
}
9191
configMap.TypeMeta = _configMapTypeMeta
@@ -105,10 +105,10 @@ func (c *Client) GetConfigMapData(name string) (map[string]string, error) {
105105

106106
func (c *Client) DeleteConfigMap(name string) (bool, error) {
107107
err := c.configMapClient.Delete(context.Background(), name, _deleteOpts)
108-
if kerrors.IsNotFound(err) {
109-
return false, nil
110-
}
111108
if err != nil {
109+
if kerrors.IsNotFound(err) {
110+
return false, nil
111+
}
112112
return false, errors.WithStack(err)
113113
}
114114
return true, nil

‎pkg/lib/k8s/deployment.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ func (c *Client) ApplyDeployment(deployment *kapps.Deployment) (*kapps.Deploymen
128128

129129
func (c *Client) GetDeployment(name string) (*kapps.Deployment, error) {
130130
deployment, err := c.deploymentClient.Get(context.Background(), name, kmeta.GetOptions{})
131-
if kerrors.IsNotFound(err) {
132-
return nil, nil
133-
}
134131
if err != nil {
132+
if kerrors.IsNotFound(err) {
133+
return nil, nil
134+
}
135135
return nil, errors.WithStack(err)
136136
}
137137
deployment.TypeMeta = _deploymentTypeMeta
@@ -140,10 +140,10 @@ func (c *Client) GetDeployment(name string) (*kapps.Deployment, error) {
140140

141141
func (c *Client) DeleteDeployment(name string) (bool, error) {
142142
err := c.deploymentClient.Delete(context.Background(), name, _deleteOpts)
143-
if kerrors.IsNotFound(err) {
144-
return false, nil
145-
}
146143
if err != nil {
144+
if kerrors.IsNotFound(err) {
145+
return false, nil
146+
}
147147
return false, errors.WithStack(err)
148148
}
149149
return true, nil

‎pkg/lib/k8s/hpa.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ func (c *Client) ApplyHPA(hpa *kautoscaling.HorizontalPodAutoscaler) (*kautoscal
105105

106106
func (c *Client) GetHPA(name string) (*kautoscaling.HorizontalPodAutoscaler, error) {
107107
hpa, err := c.hpaClient.Get(context.Background(), name, kmeta.GetOptions{})
108-
if kerrors.IsNotFound(err) {
109-
return nil, nil
110-
}
111108
if err != nil {
109+
if kerrors.IsNotFound(err) {
110+
return nil, nil
111+
}
112112
return nil, errors.WithStack(err)
113113
}
114114
hpa.TypeMeta = _hpaTypeMeta
@@ -117,10 +117,10 @@ func (c *Client) GetHPA(name string) (*kautoscaling.HorizontalPodAutoscaler, err
117117

118118
func (c *Client) DeleteHPA(name string) (bool, error) {
119119
err := c.hpaClient.Delete(context.Background(), name, _deleteOpts)
120-
if kerrors.IsNotFound(err) {
121-
return false, nil
122-
}
123120
if err != nil {
121+
if kerrors.IsNotFound(err) {
122+
return false, nil
123+
}
124124
return false, errors.WithStack(err)
125125
}
126126
return true, nil

‎pkg/lib/k8s/ingress.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ func (c *Client) ApplyIngress(ingress *kextensions.Ingress) (*kextensions.Ingres
111111

112112
func (c *Client) GetIngress(name string) (*kextensions.Ingress, error) {
113113
ingress, err := c.ingressClient.Get(context.Background(), name, kmeta.GetOptions{})
114-
if kerrors.IsNotFound(err) {
115-
return nil, nil
116-
}
117114
if err != nil {
115+
if kerrors.IsNotFound(err) {
116+
return nil, nil
117+
}
118118
return nil, errors.WithStack(err)
119119
}
120120
ingress.TypeMeta = _ingressTypeMeta
@@ -123,10 +123,10 @@ func (c *Client) GetIngress(name string) (*kextensions.Ingress, error) {
123123

124124
func (c *Client) DeleteIngress(name string) (bool, error) {
125125
err := c.ingressClient.Delete(context.Background(), name, _deleteOpts)
126-
if kerrors.IsNotFound(err) {
127-
return false, nil
128-
}
129126
if err != nil {
127+
if kerrors.IsNotFound(err) {
128+
return false, nil
129+
}
130130
return false, errors.WithStack(err)
131131
}
132132
return true, nil

‎pkg/lib/k8s/job.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ func (c *Client) ApplyJob(job *kbatch.Job) (*kbatch.Job, error) {
9999

100100
func (c *Client) GetJob(name string) (*kbatch.Job, error) {
101101
job, err := c.jobClient.Get(context.Background(), name, kmeta.GetOptions{})
102-
if kerrors.IsNotFound(err) {
103-
return nil, nil
104-
}
105102
if err != nil {
103+
if kerrors.IsNotFound(err) {
104+
return nil, nil
105+
}
106106
return nil, errors.WithStack(err)
107107
}
108108
job.TypeMeta = _jobTypeMeta
@@ -111,11 +111,10 @@ func (c *Client) GetJob(name string) (*kbatch.Job, error) {
111111

112112
func (c *Client) DeleteJob(name string) (bool, error) {
113113
err := c.jobClient.Delete(context.Background(), name, _deleteOpts)
114-
if kerrors.IsNotFound(err) {
115-
return false, nil
116-
}
117-
118114
if err != nil {
115+
if kerrors.IsNotFound(err) {
116+
return false, nil
117+
}
119118
return false, errors.WithStack(err)
120119
}
121120
return true, nil

‎pkg/lib/k8s/pod.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@ func (c *Client) WaitForPodRunning(name string, numSeconds int) error {
309309

310310
func (c *Client) GetPod(name string) (*kcore.Pod, error) {
311311
pod, err := c.podClient.Get(context.Background(), name, kmeta.GetOptions{})
312-
if kerrors.IsNotFound(err) {
313-
return nil, nil
314-
}
315312
if err != nil {
313+
if kerrors.IsNotFound(err) {
314+
return nil, nil
315+
}
316316
return nil, errors.WithStack(err)
317317
}
318318
pod.TypeMeta = _podTypeMeta
@@ -321,10 +321,10 @@ func (c *Client) GetPod(name string) (*kcore.Pod, error) {
321321

322322
func (c *Client) DeletePod(name string) (bool, error) {
323323
err := c.podClient.Delete(context.Background(), name, _deleteOpts)
324-
if kerrors.IsNotFound(err) {
325-
return false, nil
326-
}
327324
if err != nil {
325+
if kerrors.IsNotFound(err) {
326+
return false, nil
327+
}
328328
return false, errors.WithStack(err)
329329
}
330330
return true, nil

‎pkg/lib/k8s/secret.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ func (c *Client) ApplySecret(secret *kcore.Secret) (*kcore.Secret, error) {
8282

8383
func (c *Client) GetSecret(name string) (*kcore.Secret, error) {
8484
secret, err := c.secretClient.Get(context.Background(), name, kmeta.GetOptions{})
85-
if kerrors.IsNotFound(err) {
86-
return nil, nil
87-
}
8885
if err != nil {
86+
if kerrors.IsNotFound(err) {
87+
return nil, nil
88+
}
8989
return nil, errors.WithStack(err)
9090
}
9191
secret.TypeMeta = _secretTypeMeta
@@ -105,10 +105,10 @@ func (c *Client) GetSecretData(name string) (map[string][]byte, error) {
105105

106106
func (c *Client) DeleteSecret(name string) (bool, error) {
107107
err := c.secretClient.Delete(context.Background(), name, _deleteOpts)
108-
if kerrors.IsNotFound(err) {
109-
return false, nil
110-
}
111108
if err != nil {
109+
if kerrors.IsNotFound(err) {
110+
return false, nil
111+
}
112112
return false, errors.WithStack(err)
113113
}
114114
return true, nil

‎pkg/lib/k8s/service.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ func (c *Client) ApplyService(service *kcore.Service) (*kcore.Service, error) {
100100

101101
func (c *Client) GetService(name string) (*kcore.Service, error) {
102102
service, err := c.serviceClient.Get(context.Background(), name, kmeta.GetOptions{})
103-
if kerrors.IsNotFound(err) {
104-
return nil, nil
105-
}
106103
if err != nil {
104+
if kerrors.IsNotFound(err) {
105+
return nil, nil
106+
}
107107
return nil, errors.WithStack(err)
108108
}
109109
service.TypeMeta = _serviceTypeMeta
@@ -112,10 +112,10 @@ func (c *Client) GetService(name string) (*kcore.Service, error) {
112112

113113
func (c *Client) DeleteService(name string) (bool, error) {
114114
err := c.serviceClient.Delete(context.Background(), name, _deleteOpts)
115-
if kerrors.IsNotFound(err) {
116-
return false, nil
117-
}
118115
if err != nil {
116+
if kerrors.IsNotFound(err) {
117+
return false, nil
118+
}
119119
return false, errors.WithStack(err)
120120
}
121121
return true, nil

‎pkg/lib/k8s/virtual_service.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ func (c *Client) ApplyVirtualService(virtualService *istioclientnetworking.Virtu
177177

178178
func (c *Client) GetVirtualService(name string) (*istioclientnetworking.VirtualService, error) {
179179
virtualService, err := c.virtualServiceClient.Get(context.Background(), name, kmeta.GetOptions{})
180-
if kerrors.IsNotFound(err) {
181-
return nil, nil
182-
}
183180
if err != nil {
181+
if kerrors.IsNotFound(err) {
182+
return nil, nil
183+
}
184184
return nil, errors.WithStack(err)
185185
}
186186
virtualService.TypeMeta = _virtualServiceTypeMeta
@@ -189,10 +189,10 @@ func (c *Client) GetVirtualService(name string) (*istioclientnetworking.VirtualS
189189

190190
func (c *Client) DeleteVirtualService(name string) (bool, error) {
191191
err := c.virtualServiceClient.Delete(context.Background(), name, _deleteOpts)
192-
if kerrors.IsNotFound(err) {
193-
return false, nil
194-
}
195192
if err != nil {
193+
if kerrors.IsNotFound(err) {
194+
return false, nil
195+
}
196196
return false, errors.WithStack(err)
197197
}
198198
return true, nil

0 commit comments

Comments
 (0)