Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit 106592b

Browse files
committed
Fix error wrapping
1 parent 6f35d9d commit 106592b

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

controllers/crds.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ func kicCRDs() ([]*v1.CustomResourceDefinition, error) {
4444
for _, path := range manifests {
4545
f, err := os.Open(path)
4646
if err != nil {
47-
return nil, fmt.Errorf("failed to open the CRD manifest %v: %v", path, err)
47+
return nil, fmt.Errorf("failed to open the CRD manifest %v: %w", path, err)
4848
}
4949

5050
var crd v1.CustomResourceDefinition
5151

5252
err = yaml.NewYAMLOrJSONDecoder(f, decoderBufferSize).Decode(&crd)
5353

5454
if err != nil {
55-
return nil, fmt.Errorf("failed to parse the CRD manifest %v: %v", path, err)
55+
return nil, fmt.Errorf("failed to parse the CRD manifest %v: %w", path, err)
5656
}
5757

5858
err = f.Close()
5959
if err != nil {
60-
return nil, fmt.Errorf("failed to close the CRD manifest %v: %v", path, err)
60+
return nil, fmt.Errorf("failed to close the CRD manifest %v: %w", path, err)
6161
}
6262

6363
crds = append(crds, &crd)
@@ -87,18 +87,18 @@ func createKICCustomResourceDefinitions(log logr.Logger, mgr manager.Manager) er
8787
log.V(1).Info(fmt.Sprintf("no previous CRD %v found, creating a new one.", crd.Name))
8888
_, err = crdsClient.Create(context.TODO(), crd, metav1.CreateOptions{})
8989
if err != nil {
90-
return fmt.Errorf("error creating CRD %v: %v", crd.Name, err)
90+
return fmt.Errorf("error creating CRD %v: %w", crd.Name, err)
9191
}
9292
} else {
93-
return fmt.Errorf("error getting CRD %v: %v", crd.Name, err)
93+
return fmt.Errorf("error getting CRD %v: %w", crd.Name, err)
9494
}
9595
} else {
9696
// Update CRDs if they already exist
9797
log.V(1).Info(fmt.Sprintf("previous CRD %v found, updating.", crd.Name))
9898
oldCRD.Spec = crd.Spec
9999
_, err = crdsClient.Update(context.TODO(), oldCRD, metav1.UpdateOptions{})
100100
if err != nil {
101-
return fmt.Errorf("error updating CRD %v: %v", crd.Name, err)
101+
return fmt.Errorf("error updating CRD %v: %w", crd.Name, err)
102102
}
103103
}
104104
}

controllers/prerequisites.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,18 @@ func (r *NginxIngressControllerReconciler) createCommonResources(log logr.Logger
140140
log.Info("no previous ClusterRole found, creating a new one.")
141141
err = r.Create(context.TODO(), cr)
142142
if err != nil {
143-
return fmt.Errorf("error creating ClusterRole: %v", err)
143+
return fmt.Errorf("error creating ClusterRole: %w", err)
144144
}
145145
} else {
146-
return fmt.Errorf("error getting ClusterRole: %v", err)
146+
return fmt.Errorf("error getting ClusterRole: %w", err)
147147
}
148148
} else {
149149
// For updates in the ClusterRole permissions (eg new CRDs of the Ingress Controller).
150150
log.Info("previous ClusterRole found, updating.")
151151
cr := clusterRoleForNginxIngressController(clusterRoleName)
152152
err = r.Update(context.TODO(), cr)
153153
if err != nil {
154-
return fmt.Errorf("error updating ClusterRole: %v", err)
154+
return fmt.Errorf("error updating ClusterRole: %w", err)
155155
}
156156
}
157157

@@ -164,12 +164,12 @@ func (r *NginxIngressControllerReconciler) createCommonResources(log logr.Logger
164164
}
165165

166166
if err != nil {
167-
return fmt.Errorf("error creating ClusterRoleBinding: %v", err)
167+
return fmt.Errorf("error creating ClusterRoleBinding: %w", err)
168168
}
169169

170170
err = createKICCustomResourceDefinitions(log, r.Mgr)
171171
if err != nil {
172-
return fmt.Errorf("error creating KIC CRDs: %v", err)
172+
return fmt.Errorf("error creating KIC CRDs: %w", err)
173173
}
174174

175175
if r.SccAPIExists {
@@ -184,7 +184,7 @@ func (r *NginxIngressControllerReconciler) createCommonResources(log logr.Logger
184184
}
185185

186186
if err != nil {
187-
return fmt.Errorf("error creating SecurityContextConstraints: %v", err)
187+
return fmt.Errorf("error creating SecurityContextConstraints: %w", err)
188188
}
189189
}
190190

controllers/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func GetK8sVersion(client kubernetes.Interface) (v *version.Version, err error)
205205

206206
runningVersion, err := version.ParseGeneric(serverVersion.String())
207207
if err != nil {
208-
return nil, fmt.Errorf("unexpected error parsing running Kubernetes version: %v", err)
208+
return nil, fmt.Errorf("unexpected error parsing running Kubernetes version: %w", err)
209209
}
210210

211211
return runningVersion, nil

0 commit comments

Comments
 (0)