Skip to content

Commit 68fc288

Browse files
committed
fix: use slices.Concat
1 parent 650a5e4 commit 68fc288

File tree

1 file changed

+4
-3
lines changed
  • pkg/handlers/generic/mutation/extraapiservercertsans

1 file changed

+4
-3
lines changed

pkg/handlers/generic/mutation/extraapiservercertsans/inject.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (h *extraAPIServerCertSANsPatchHandler) Mutate(
5454
obj *unstructured.Unstructured,
5555
vars map[string]apiextensionsv1.JSON,
5656
holderRef runtimehooksv1.HolderReference,
57-
clusterKey client.ObjectKey,
57+
_ client.ObjectKey,
5858
clusterGetter mutation.ClusterGetter,
5959
) error {
6060
log := ctrl.LoggerFrom(ctx).WithValues(
@@ -70,6 +70,7 @@ func (h *extraAPIServerCertSANsPatchHandler) Mutate(
7070
err,
7171
"failed to get cluster config variable from extraAPIServerCertSANs mutation handler",
7272
)
73+
return err
7374
}
7475
if !found {
7576
log.V(5).Info("Extra API server cert SANs variable not defined")
@@ -80,10 +81,10 @@ func (h *extraAPIServerCertSANsPatchHandler) Mutate(
8081
err,
8182
"failed to get cluster from extraAPIServerCertSANs mutation handler",
8283
)
84+
return err
8385
}
8486
defaultAPICertSANs := getDefaultAPIServerSANs(cluster)
85-
apiCertSANs := slices.Clone[[]string](extraAPIServerCertSANsVar)
86-
apiCertSANs = append(apiCertSANs, defaultAPICertSANs...)
87+
apiCertSANs := slices.Concat(extraAPIServerCertSANsVar, defaultAPICertSANs)
8788
slices.Sort(apiCertSANs)
8889
apiCertSANs = slices.Compact(apiCertSANs)
8990
log = log.WithValues(

0 commit comments

Comments
 (0)