Skip to content

Commit eeb3fad

Browse files
jukiejukie
committed
lint and test fixes
Signed-off-by: Jukie <[email protected]>
1 parent df0d88d commit eeb3fad

File tree

4 files changed

+34
-42
lines changed

4 files changed

+34
-42
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ require (
2727
github.com/go-logfmt/logfmt v0.6.0
2828
github.com/go-logr/logr v1.4.2
2929
github.com/go-logr/zapr v1.3.0
30-
github.com/go-openapi/jsonpointer v0.21.1
3130
github.com/go-openapi/spec v0.21.0
3231
github.com/go-openapi/strfmt v0.23.0
3332
github.com/go-openapi/validate v0.24.0
@@ -62,6 +61,7 @@ require (
6261
go.uber.org/zap v1.27.0
6362
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
6463
golang.org/x/net v0.39.0
64+
gomodules.xyz/jsonpatch/v2 v2.4.0
6565
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a
6666
google.golang.org/grpc v1.72.0
6767
google.golang.org/grpc/security/advancedtls v1.0.0
@@ -221,6 +221,7 @@ require (
221221
github.com/go-ole/go-ole v1.3.0 // indirect
222222
github.com/go-openapi/analysis v0.23.0 // indirect
223223
github.com/go-openapi/errors v0.22.0 // indirect
224+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
224225
github.com/go-openapi/jsonreference v0.21.0 // indirect
225226
github.com/go-openapi/loads v0.22.0 // indirect
226227
github.com/go-openapi/swag v0.23.1 // indirect
@@ -489,7 +490,6 @@ require (
489490
golang.org/x/time v0.10.0 // indirect
490491
golang.org/x/tools v0.31.0 // indirect
491492
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
492-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
493493
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
494494
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
495495
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect

‎internal/cmd/certgen.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
"errors"
1212
"fmt"
1313
"io"
14-
corev1 "k8s.io/api/core/v1"
15-
"k8s.io/apimachinery/pkg/types"
1614
"path"
1715

1816
"github.com/spf13/cobra"
1917
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
18+
corev1 "k8s.io/api/core/v1"
19+
"k8s.io/apimachinery/pkg/types"
2020
"sigs.k8s.io/controller-runtime/pkg/client"
2121
clicfg "sigs.k8s.io/controller-runtime/pkg/client/config"
2222

@@ -82,7 +82,7 @@ func certGen(ctx context.Context, logOut io.Writer, local bool) error {
8282
if err = outputCertsForKubernetes(ctx, cli, cfg, overwriteControlPlaneCerts, certs); err != nil {
8383
return fmt.Errorf("failed to output certificates: %w", err)
8484
}
85-
if err = patchTopologyInjectorWebhook(ctx, cli, cfg, certs.CACertificate); err != nil {
85+
if err = patchTopologyInjectorWebhook(ctx, cli, cfg); err != nil {
8686
return fmt.Errorf("failed to patch webhook: %w", err)
8787
}
8888
} else {
@@ -118,7 +118,7 @@ func outputCertsForKubernetes(ctx context.Context, cli client.Client, cfg *confi
118118
return nil
119119
}
120120

121-
func patchTopologyInjectorWebhook(ctx context.Context, cli client.Client, cfg *config.Server, caBundle []byte) error {
121+
func patchTopologyInjectorWebhook(ctx context.Context, cli client.Client, cfg *config.Server) error {
122122
if disableTopologyInjector {
123123
return nil
124124
}

‎internal/provider/kubernetes/topology_injector.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"context"
1010
"encoding/json"
1111
"fmt"
12+
1213
corev1 "k8s.io/api/core/v1"
1314
"k8s.io/apimachinery/pkg/types"
1415
"k8s.io/klog/v2"

‎internal/provider/kubernetes/topology_injector_test.go

+27-36
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"testing"
1212

1313
"github.com/stretchr/testify/require"
14+
"gomodules.xyz/jsonpatch/v2"
1415
admissionv1 "k8s.io/api/admission/v1"
1516
corev1 "k8s.io/api/core/v1"
1617
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,11 +46,11 @@ func TestProxyTopologyInjector_Handle(t *testing.T) {
4546
}
4647

4748
cases := []struct {
48-
caseName string
49-
obj client.Object
50-
node *corev1.Node
51-
pod *corev1.Pod
52-
wantErr bool
49+
caseName string
50+
obj client.Object
51+
node *corev1.Node
52+
pod *corev1.Pod
53+
expectedPatchResp []jsonpatch.JsonPatchOperation
5354
}{
5455
{
5556
caseName: "valid binding",
@@ -60,9 +61,15 @@ func TestProxyTopologyInjector_Handle(t *testing.T) {
6061
},
6162
Target: corev1.ObjectReference{Name: defaultNode.Name},
6263
},
63-
node: defaultNode,
64-
pod: defaultPod,
65-
wantErr: false,
64+
node: defaultNode,
65+
pod: defaultPod,
66+
expectedPatchResp: []jsonpatch.JsonPatchOperation{{
67+
Operation: "add",
68+
Path: "/metadata/annotations",
69+
Value: map[string]interface{}{
70+
"topology.kubernetes.io/zone": "zone1",
71+
},
72+
}},
6673
},
6774
{
6875
caseName: "empty target",
@@ -72,9 +79,9 @@ func TestProxyTopologyInjector_Handle(t *testing.T) {
7279
Namespace: defaultPod.Namespace,
7380
},
7481
},
75-
node: defaultNode,
76-
pod: defaultPod,
77-
wantErr: true,
82+
node: defaultNode,
83+
pod: defaultPod,
84+
expectedPatchResp: nil,
7885
},
7986
{
8087
caseName: "skip binding - no label",
@@ -84,9 +91,9 @@ func TestProxyTopologyInjector_Handle(t *testing.T) {
8491
Namespace: "bar",
8592
},
8693
},
87-
node: defaultNode,
88-
pod: &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Namespace: "bar", Name: "baz"}},
89-
wantErr: true,
94+
node: defaultNode,
95+
pod: &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Namespace: "bar", Name: "baz"}},
96+
expectedPatchResp: nil,
9097
},
9198
{
9299
caseName: "no matching pod",
@@ -96,9 +103,9 @@ func TestProxyTopologyInjector_Handle(t *testing.T) {
96103
Namespace: "bar",
97104
},
98105
},
99-
node: defaultNode,
100-
pod: defaultPod,
101-
wantErr: true,
106+
node: defaultNode,
107+
pod: defaultPod,
108+
expectedPatchResp: nil,
102109
},
103110
}
104111
for _, tc := range cases {
@@ -120,9 +127,7 @@ func TestProxyTopologyInjector_Handle(t *testing.T) {
120127
}
121128

122129
objBytes, err := json.Marshal(tc.obj)
123-
if err != nil {
124-
t.Fatalf("failed to marshal object: %v", err)
125-
}
130+
require.NoError(t, err)
126131

127132
req := admission.Request{
128133
AdmissionRequest: admissionv1.AdmissionRequest{
@@ -135,23 +140,9 @@ func TestProxyTopologyInjector_Handle(t *testing.T) {
135140
}
136141

137142
resp := mutator.Handle(context.Background(), req)
143+
require.True(t, resp.Allowed)
138144

139-
if !resp.Allowed && tc.wantErr {
140-
t.Fatalf("expected Allowed response, got: %v", resp.Result)
141-
}
142-
143-
updatedPod := &corev1.Pod{}
144-
if err = fakeClient.Get(context.Background(), types.NamespacedName{Name: tc.pod.Name, Namespace: tc.pod.Namespace}, updatedPod); err != nil {
145-
t.Fatalf("get pod: %v", err)
146-
}
147-
148-
zone, ok := updatedPod.Labels[corev1.LabelTopologyZone]
149-
if tc.wantErr {
150-
require.False(t, ok, "pod has unexpected topology label: %v", updatedPod)
151-
} else {
152-
require.True(t, ok, "pod does not have expected topology label: %v", updatedPod)
153-
require.Equal(t, zone, tc.node.Labels[corev1.LabelTopologyZone])
154-
}
145+
require.Equal(t, tc.expectedPatchResp, resp.Patches)
155146
})
156147
}
157148
}

0 commit comments

Comments
 (0)