diff --git a/go.mod b/go.mod index 1e8d1acd4..b09bfb239 100644 --- a/go.mod +++ b/go.mod @@ -43,12 +43,12 @@ require ( 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/apimachinery v0.0.0-20230107073608-9f24624c29e7 + k8s.io/client-go v0.0.0-20230107075103-fda1b1132eb2 + k8s.io/component-base v0.0.0-20230107080738-c023e83ebc7e 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-20230107081412-94e3799ee43e + 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 @@ -123,8 +123,8 @@ 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/apimachinery => k8s.io/apimachinery v0.0.0-20230107073608-9f24624c29e7 + k8s.io/client-go => k8s.io/client-go v0.0.0-20230107075103-fda1b1132eb2 + k8s.io/component-base => k8s.io/component-base v0.0.0-20230107080738-c023e83ebc7e + k8s.io/kms => k8s.io/kms v0.0.0-20230107081412-94e3799ee43e ) diff --git a/go.sum b/go.sum index 1fdd05952..a0177394a 100644 --- a/go.sum +++ b/go.sum @@ -990,18 +990,18 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 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/apimachinery v0.0.0-20230107073608-9f24624c29e7 h1:0gxaTXU6ksDTV62n/rmtKEFfTsFK+pZgdDRmhNO51F4= +k8s.io/apimachinery v0.0.0-20230107073608-9f24624c29e7/go.mod h1:bS4cKOGY9pt43tVyeFp0x+bfbBlZcU4ldxfmlqVMrj0= +k8s.io/client-go v0.0.0-20230107075103-fda1b1132eb2 h1:qTIerGOlv94AhF+YQeijftgjpYwz1LHZDEbBN1aM9ik= +k8s.io/client-go v0.0.0-20230107075103-fda1b1132eb2/go.mod h1:cN7iFGG1H2byME8Rp4slmRNbEcskna/b0Wj6U8Lca7Q= +k8s.io/component-base v0.0.0-20230107080738-c023e83ebc7e h1:zNm+ms6ZZX8HgU7970b7P2pUlL+XAln5ObB5FNAulKo= +k8s.io/component-base v0.0.0-20230107080738-c023e83ebc7e/go.mod h1:9aL6hhcL3/JOO4Lob4GFQ8P299dfWRt6Q14P9CkOmCE= 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/kms v0.0.0-20230107081412-94e3799ee43e h1:DiddUtNtaci4Fyf/EogSOwzf4dJ/85kvIL4Og2Hfhrw= +k8s.io/kms v0.0.0-20230107081412-94e3799ee43e/go.mod h1:GjuMf2f3LH2lOFFeAkVRJeIRSyXNd3y+FXR+NNmnhy8= +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= 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