Skip to content

Commit 24a22c6

Browse files
committed
fix lint issues
1 parent 2b21bbd commit 24a22c6

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.golangci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,3 +373,9 @@ issues:
373373
- linters:
374374
- govet
375375
text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\."
376+
# Ignore ginkgolinter suggestions
377+
- linters:
378+
- ginkgolinter
379+
text: "(wrong error assertion|wrong comparison assertion)"
380+
path: "(.+)_test\\.go$"
381+

exp/addons/internal/controllers/clusterresourceset_helpers.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,7 @@ func (r *ClusterResourceSetReconciler) getOrCreateClusterResourceSetBinding(ctx
147147
// getConfigMap retrieves any ConfigMap from the given name and namespace.
148148
func getConfigMap(ctx context.Context, c client.Client, configmapName types.NamespacedName) (*corev1.ConfigMap, error) {
149149
configMap := &corev1.ConfigMap{}
150-
configMapKey := client.ObjectKey{
151-
Namespace: configmapName.Namespace,
152-
Name: configmapName.Name,
153-
}
154-
if err := c.Get(ctx, configMapKey, configMap); err != nil {
150+
if err := c.Get(ctx, configmapName, configMap); err != nil {
155151
return nil, err
156152
}
157153

@@ -161,11 +157,7 @@ func getConfigMap(ctx context.Context, c client.Client, configmapName types.Name
161157
// getSecret retrieves any Secret from the given secret name and namespace.
162158
func getSecret(ctx context.Context, c client.Client, secretName types.NamespacedName) (*corev1.Secret, error) {
163159
secret := &corev1.Secret{}
164-
secretKey := client.ObjectKey{
165-
Namespace: secretName.Namespace,
166-
Name: secretName.Name,
167-
}
168-
if err := c.Get(ctx, secretKey, secret); err != nil {
160+
if err := c.Get(ctx, secretName, secret); err != nil {
169161
return nil, err
170162
}
171163

0 commit comments

Comments
 (0)