Skip to content

Commit 7660ce9

Browse files
committed
feat: update conversion helpers
Signed-off-by: Jian Zeng <[email protected]>
1 parent 82c6296 commit 7660ce9

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

pkg/apis/core/v1/conversion.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,3 +554,13 @@ func Convert_core_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *core.Persi
554554
func Convert_v1_PersistentVolumeSpec_To_core_PersistentVolumeSpec(in *v1.PersistentVolumeSpec, out *core.PersistentVolumeSpec, s conversion.Scope) error {
555555
return autoConvert_v1_PersistentVolumeSpec_To_core_PersistentVolumeSpec(in, out, s)
556556
}
557+
558+
// Convert_Slice_string_To_Pointer_v1_LogStreamType is needed because decoding URL parameters requires manual assistance.
559+
func Convert_Slice_string_To_Pointer_v1_LogStreamType(in *[]string, out **v1.LogStreamType, s conversion.Scope) error {
560+
if len(*in) == 0 {
561+
return nil
562+
}
563+
temp := v1.LogStreamType((*in)[0])
564+
*out = &temp
565+
return nil
566+
}

pkg/apis/core/v1/conversion_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ func TestPodLogOptions(t *testing.T) {
5252
sinceTime := metav1.NewTime(time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC).Local())
5353
tailLines := int64(2)
5454
limitBytes := int64(3)
55+
v1StreamStderr := v1.LogStreamTypeStderr
56+
coreStreamStderr := core.LogStreamTypeStderr
5557

5658
versionedLogOptions := &v1.PodLogOptions{
5759
Container: "mycontainer",
@@ -62,6 +64,7 @@ func TestPodLogOptions(t *testing.T) {
6264
Timestamps: true,
6365
TailLines: &tailLines,
6466
LimitBytes: &limitBytes,
67+
Stream: &v1StreamStderr,
6568
}
6669
unversionedLogOptions := &core.PodLogOptions{
6770
Container: "mycontainer",
@@ -72,6 +75,7 @@ func TestPodLogOptions(t *testing.T) {
7275
Timestamps: true,
7376
TailLines: &tailLines,
7477
LimitBytes: &limitBytes,
78+
Stream: &coreStreamStderr,
7579
}
7680
expectedParameters := url.Values{
7781
"container": {"mycontainer"},
@@ -82,6 +86,7 @@ func TestPodLogOptions(t *testing.T) {
8286
"timestamps": {"true"},
8387
"tailLines": {"2"},
8488
"limitBytes": {"3"},
89+
"stream": {"Stderr"},
8590
}
8691

8792
codec := runtime.NewParameterCodec(legacyscheme.Scheme)

0 commit comments

Comments
 (0)