Skip to content

Commit 27b887c

Browse files
committed
Minor fixes
1 parent 6a328d7 commit 27b887c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ require (
5050
k8s.io/kubectl v0.31.1
5151
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
5252
sigs.k8s.io/controller-runtime v0.19.0
53+
sigs.k8s.io/gateway-api v1.0.0 // indirect
5354
sigs.k8s.io/yaml v1.4.0
5455
)
5556

56-
require sigs.k8s.io/gateway-api v1.0.0 // indirect
57-
5857
require (
5958
cloud.google.com/go/auth v0.7.0 // indirect
6059
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect

internal/manifests/targetallocator/adapters/config_to_prom_config_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,6 @@ func TestAddTAConfigToPromConfigWithTLSConfig(t *testing.T) {
539539
}
540540

541541
taServiceName := "test-targetallocator"
542-
taServiceNamespace := "default"
543542

544543
expectedResult := map[interface{}]interface{}{
545544
"config": map[interface{}]interface{}{},
@@ -555,7 +554,7 @@ func TestAddTAConfigToPromConfigWithTLSConfig(t *testing.T) {
555554
},
556555
}
557556

558-
result, err := ta.AddTAConfigToPromConfig(cfg, taServiceName, taServiceNamespace, ta.WithTLSConfig("ca.crt", "tls.crt", "tls.key", taServiceName))
557+
result, err := ta.AddTAConfigToPromConfig(cfg, taServiceName, ta.WithTLSConfig("ca.crt", "tls.crt", "tls.key", taServiceName))
559558

560559
assert.NoError(t, err)
561560
assert.Equal(t, expectedResult, result)

internal/manifests/targetallocator/targetallocator.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ func Build(params Params) ([]client.Object, error) {
4848
}
4949

5050
if params.Config.CertManagerAvailability() == certmanager.Available && featuregate.EnableTargetAllocatorMTLS.IsEnabled() {
51-
resourceFactories = append(resourceFactories, manifests.FactoryWithoutError(SelfSignedIssuer))
52-
resourceFactories = append(resourceFactories, manifests.FactoryWithoutError(CACertificate))
53-
resourceFactories = append(resourceFactories, manifests.FactoryWithoutError(CAIssuer))
54-
resourceFactories = append(resourceFactories, manifests.FactoryWithoutError(ServingCertificate))
55-
resourceFactories = append(resourceFactories, manifests.FactoryWithoutError(ClientCertificate))
51+
resourceFactories = append(resourceFactories,
52+
manifests.FactoryWithoutError(SelfSignedIssuer),
53+
manifests.FactoryWithoutError(CACertificate),
54+
manifests.FactoryWithoutError(CAIssuer),
55+
manifests.FactoryWithoutError(ServingCertificate),
56+
manifests.FactoryWithoutError(ClientCertificate),
57+
)
5658
}
5759

5860
for _, factory := range resourceFactories {

0 commit comments

Comments
 (0)