From 8e211636c361fc29c46fb55027c2672be56cc141 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 6 Jan 2023 12:21:58 -0500 Subject: [PATCH 1/2] bump kube-openapi Kubernetes-commit: d78de56d769ee9bd2193ccadbac5621d4a0ae89d --- go.mod | 23 ++++++++++++----------- go.sum | 14 ++------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 1e8d1acd4..7bfa1d6d0 100644 --- a/go.mod +++ b/go.mod @@ -42,13 +42,13 @@ require ( google.golang.org/protobuf v1.28.1 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 - k8s.io/api v0.0.0-20230107074241-4c5bbc66c0cd - k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e - k8s.io/client-go v0.0.0-20230107075100-bd7ed9e64757 - k8s.io/component-base v0.0.0-20230107080735-3f7abee6711b + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog/v2 v2.80.1 - k8s.io/kms v0.0.0-20221223035546-6bcec3321a14 - k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 + k8s.io/kms v0.0.0 + k8s.io/kube-openapi v0.0.0-20230106171958-10e5f0effbd2 k8s.io/utils v0.0.0-20221107191617-1a15be271d1d sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 @@ -122,9 +122,10 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230107074241-4c5bbc66c0cd - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e - k8s.io/client-go => k8s.io/client-go v0.0.0-20230107075100-bd7ed9e64757 - k8s.io/component-base => k8s.io/component-base v0.0.0-20230107080735-3f7abee6711b - k8s.io/kms => k8s.io/kms v0.0.0-20221223035546-6bcec3321a14 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kms => ../kms ) diff --git a/go.sum b/go.sum index 1fdd05952..f8e90a50c 100644 --- a/go.sum +++ b/go.sum @@ -988,20 +988,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20230107074241-4c5bbc66c0cd h1:iDju7NYcFTgOeJarrPmX0qc9uXr5nU5LKHijE1INtgs= -k8s.io/api v0.0.0-20230107074241-4c5bbc66c0cd/go.mod h1:px3X++GKEGF928lTCHhyEsNXavqUZ+3qMJvcwCJS/Eo= -k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e h1:eJYyIfU4uOvJsSbI8fQkqQa+udeFbJDBUjw0I2F30k0= -k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e/go.mod h1:E7c0pLSvNLZyzn9NBKnVO5+N8E8J25dNmB4m9TyuirA= -k8s.io/client-go v0.0.0-20230107075100-bd7ed9e64757 h1:h8wxVXnc2QmccHYhlY8sqCa628J9SJzcgJd3cI/+Eec= -k8s.io/client-go v0.0.0-20230107075100-bd7ed9e64757/go.mod h1:iSe0LIKVehUQP1b8pJpWe09GqhCop0pmKcdSxw6GhXg= -k8s.io/component-base v0.0.0-20230107080735-3f7abee6711b h1:+9c6OqgE/RN47Bi97PV0uaHsWvno5H2lZagIU3XxFuQ= -k8s.io/component-base v0.0.0-20230107080735-3f7abee6711b/go.mod h1:+pYn8+vEltuUXt84L0xLZJNxWS5ArWV+1OCMZbkznkA= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.0.0-20221223035546-6bcec3321a14 h1:BLaDgiUPi2P78tmi0RHv7buWRPokavOk5jBcuUWC3s4= -k8s.io/kms v0.0.0-20221223035546-6bcec3321a14/go.mod h1:c0I0NrpBKFVVcrW2F8cf7r+Df6jsOkT59zTHEs9z2IY= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= +k8s.io/kube-openapi v0.0.0-20230106171958-10e5f0effbd2 h1:KYLG+YkfkVf4kdRVshpZZPHpiAyesloMrDE9k1B9Jaw= +k8s.io/kube-openapi v0.0.0-20230106171958-10e5f0effbd2/go.mod h1:/tm0KhSzkvLFxnfnIwgoRdtgzvT2UbF3Xz3hTqgr6MA= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From b0b89e7e65d8f178ff3eba90e2cf9ca9e320c8d5 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 6 Jan 2023 00:58:23 -0500 Subject: [PATCH 2/2] Prune trailing newlines when enums are disabled Kubernetes-commit: d0967bbe5e78dbcdd5bc189d5fc2becafc4be0f2 --- pkg/util/openapi/enablement.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/openapi/enablement.go b/pkg/util/openapi/enablement.go index 693821ac0..b1db3c42b 100644 --- a/pkg/util/openapi/enablement.go +++ b/pkg/util/openapi/enablement.go @@ -68,7 +68,7 @@ func pruneEnums(schema *spec.Schema) *spec.Schema { // note that the new lines before the header should be removed too, // thus the slice range. clone() - schema.Description = schema.Description[:headerIndex] + schema.Description = strings.TrimSpace(schema.Description[:headerIndex]) } if len(schema.Enum) != 0 { // remove the enum field