Skip to content

Commit 2f362d2

Browse files
authored
Unpin k8s libs (#7413)
Signed-off-by: Jason Parraga <sovietaced@gmail.com>
1 parent 72c8930 commit 2f362d2

7 files changed

Lines changed: 327 additions & 210 deletions

File tree

executor/pkg/webhook/pod.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func NewPodMutator(ctx context.Context, cfg *webhookConfig.Config, podNamespace
146146
}
147147

148148
return &PodMutator{
149-
decoder: *admission.NewDecoder(scheme),
149+
decoder: admission.NewDecoder(scheme),
150150
cfg: cfg,
151151
secretsMutator: secretsMutator,
152152
}, nil

flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"reflect"
77
"testing"
88

9-
"github.com/golang/protobuf/proto"
109
"github.com/stretchr/testify/assert"
1110
v12 "k8s.io/api/core/v1"
1211
"k8s.io/apimachinery/pkg/api/resource"
@@ -64,7 +63,7 @@ func TestGetExecutionEnvVars(t *testing.T) {
6463
envVars := GetExecutionEnvVars(mock, tt.consoleURL)
6564
assert.Len(t, envVars, tt.expectedEnvVars)
6665
if tt.expectedEnvVar != nil {
67-
assert.True(t, proto.Equal(&envVars[5], tt.expectedEnvVar))
66+
assert.Equal(t, tt.expectedEnvVar, &envVars[5])
6867
}
6968
}
7069
}

flyteplugins/go/tasks/pluginmachinery/flytek8s/plugin_exec_context_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import (
1616
func Test_NodeExecutionK8sReader(t *testing.T) {
1717
execID := "abc123"
1818
nodeID := "n0"
19-
typeMeta := metav1.TypeMeta{
20-
Kind: "Pod",
21-
APIVersion: "v1",
22-
}
19+
typeMeta := metav1.TypeMeta{} // not preserved in fake client
2320
pod1 := v1.Pod{
2421
TypeMeta: typeMeta,
2522
ObjectMeta: metav1.ObjectMeta{
@@ -106,12 +103,10 @@ func Test_NodeExecutionK8sReader(t *testing.T) {
106103

107104
t.Run("list", func(t *testing.T) {
108105
p := &v1.PodList{}
106+
109107
expected := &v1.PodList{
110-
TypeMeta: metav1.TypeMeta{
111-
Kind: "PodList",
112-
APIVersion: "v1",
113-
},
114-
Items: []v1.Pod{pod1, pod2},
108+
TypeMeta: metav1.TypeMeta{}, // not preserved in fake client
109+
Items: []v1.Pod{pod1, pod2},
115110
}
116111

117112
err := nodeExecReader.List(ctx, p)

flyteplugins/go/tasks/pluginmachinery/secret/mocks/mocks.go

Lines changed: 76 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/go/flyteidl2/plugins/mocks/mocks.go

Lines changed: 69 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)