Bug 1844471: bump kubernetes to 1.19.0-rc.2

pkg/build/apis/build/v1/conversion.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"net/url"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
 
@@ -180,6 +181,90 @@ func Convert_v1_BinaryBuildRequestOptions_To_url_Values(in *v1.BinaryBuildReques
 	return nil
 }
 
+func Convert_url_Values_To_v1_BuildLogOptions(in *url.Values, out *v1.BuildLogOptions, s conversion.Scope) error {
+	if in == nil || out == nil {
+		return nil
+	}
+	if values, ok := map[string][]string(*in)["container"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_string(&values, &out.Container, s); err != nil {
+			return err
+		}
+	} else {
+		out.Container = ""
+	}
+	if values, ok := map[string][]string(*in)["follow"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_bool(&values, &out.Follow, s); err != nil {
+			return err
+		}
+	} else {
+		out.Follow = false
+	}
+	if values, ok := map[string][]string(*in)["previous"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_bool(&values, &out.Previous, s); err != nil {
+			return err
+		}
+	} else {
+		out.Previous = false
+	}
+	if values, ok := map[string][]string(*in)["sinceSeconds"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.SinceSeconds, s); err != nil {
+			return err
+		}
+	} else {
+		out.SinceSeconds = nil
+	}
+	if values, ok := map[string][]string(*in)["sinceTime"]; ok && len(values) > 0 {
+		if err := metav1.Convert_Slice_string_To_Pointer_v1_Time(&values, &out.SinceTime, s); err != nil {
+			return err
+		}
+	} else {
+		out.SinceTime = nil
+	}
+	if values, ok := map[string][]string(*in)["timestamps"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_bool(&values, &out.Timestamps, s); err != nil {
+			return err
+		}
+	} else {
+		out.Timestamps = false
+	}
+	if values, ok := map[string][]string(*in)["tailLines"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.TailLines, s); err != nil {
+			return err
+		}
+	} else {
+		out.TailLines = nil
+	}
+	if values, ok := map[string][]string(*in)["limitBytes"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.LimitBytes, s); err != nil {
+			return err
+		}
+	} else {
+		out.LimitBytes = nil
+	}
+	if values, ok := map[string][]string(*in)["nowait"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_bool(&values, &out.NoWait, s); err != nil {
+			return err
+		}
+	} else {
+		out.NoWait = false
+	}
+	if values, ok := map[string][]string(*in)["version"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_Pointer_int64(&values, &out.Version, s); err != nil {
+			return err
+		}
+	} else {
+		out.Version = nil
+	}
+	if values, ok := map[string][]string(*in)["insecureSkipTLSVerifyBackend"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_bool(&values, &out.InsecureSkipTLSVerifyBackend, s); err != nil {
+			return err
+		}
+	} else {
+		out.InsecureSkipTLSVerifyBackend = false
+	}
+	return nil
+}
+
 // AddCustomConversionFuncs adds conversion functions which cannot be automatically generated.
 // This is typically due to the objects not having 1:1 field mappings.
 func AddCustomConversionFuncs(scheme *runtime.Scheme) error {
@@ -193,6 +278,11 @@ func AddCustomConversionFuncs(scheme *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
+	if err := scheme.AddConversionFunc((*url.Values)(nil), (*v1.BuildLogOptions)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_url_Values_To_v1_BuildLogOptions(a.(*url.Values), b.(*v1.BuildLogOptions), scope)
+	}); err != nil {
+		return err
+	}
 	return nil
 }
 

pkg/build/apis/build/v1/conversion_test.go

@@ -2,12 +2,15 @@ package v1
 
 import (
 	"testing"
+	"time"
 
 	corev1 "k8s.io/api/core/v1"
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion/queryparams"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apimachinery/pkg/util/diff"
 	kinternal "k8s.io/kubernetes/pkg/apis/core"
 
 	v1 "github.com/openshift/api/build/v1"
@@ -387,3 +390,46 @@ func TestImageChangeTriggerNilImageChangePointer(t *testing.T) {
 		}
 	}
 }
+
+func TestBuildLogOptionsOptions(t *testing.T) {
+	sinceSeconds := int64(1)
+	sinceTime := metav1.NewTime(time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC).Local())
+	tailLines := int64(2)
+	limitBytes := int64(3)
+
+	unversionedBuildLogOptions := &internal.BuildLogOptions{
+		Container:    "mycontainer",
+		Follow:       true,
+		Previous:     true,
+		SinceSeconds: &sinceSeconds,
+		SinceTime:    &sinceTime,
+		Timestamps:   true,
+		TailLines:    &tailLines,
+		LimitBytes:   &limitBytes,
+	}
+	versionedBuildLogOptions, err := scheme.ConvertToVersion(unversionedBuildLogOptions, v1.GroupVersion)
+	if err != nil {
+		t.Fatal(err)
+	}
+	params, err := queryparams.Convert(versionedBuildLogOptions)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// checks "query params -> versioned" conversion
+	{
+		convertedVersionedBuildLogOptions := &v1.BuildLogOptions{}
+		if err := scheme.Convert(&params, convertedVersionedBuildLogOptions, nil); err != nil {
+			t.Fatal(err)
+		}
+
+		// TypeMeta is not filled by the conversion functions
+		// Setting it manually to simplify testing.
+		convertedVersionedBuildLogOptions.TypeMeta.Kind = "BuildLogOptions"
+		convertedVersionedBuildLogOptions.TypeMeta.APIVersion = v1.GroupVersion.String()
+
+		if !apiequality.Semantic.DeepEqual(convertedVersionedBuildLogOptions, versionedBuildLogOptions) {
+			t.Fatalf("Unexpected deserialization:\n%s", diff.ObjectGoPrintSideBySide(versionedBuildLogOptions, convertedVersionedBuildLogOptions))
+		}
+	}
+}