Merge pull request #112731 from pacoxu/blackfriday-v2

upgrade Blackfriday to v2 and re-implement render

Kubernetes-commit: 8d1ba6a0861d4c11336d2a9895c3800d9fc795c4
This commit is contained in:
Kubernetes Publisher 2022-09-29 08:44:53 -07:00
parent e0b132cd00
commit 90682f9d52
2 changed files with 29 additions and 16 deletions

31
go.mod
View File

@ -29,15 +29,15 @@ require (
github.com/stretchr/testify v1.8.0
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/api v0.0.0-20220922184533-be233f856791
k8s.io/apimachinery v0.0.0-20220922184044-826a74e82875
k8s.io/cli-runtime v0.0.0-20220922193734-3141d5468ff0
k8s.io/client-go v0.0.0-20220926163418-2f43d370b32c
k8s.io/component-base v0.0.0-20220928223046-40d14bdbd62f
k8s.io/component-helpers v0.0.0-20220922190532-f4131335a651
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20220926170735-60b7c6e9742e
k8s.io/utils v0.0.0-20220922133306-665eaaec4324
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
@ -91,13 +91,12 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20220922184533-be233f856791
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220922184044-7fb78ee96289
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220922193734-3141d5468ff0
k8s.io/client-go => k8s.io/client-go v0.0.0-20220926163418-2f43d370b32c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220926162019-1d82d12fa310
k8s.io/component-base => k8s.io/component-base v0.0.0-20220928223046-40d14bdbd62f
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220922190532-f4131335a651
k8s.io/metrics => k8s.io/metrics v0.0.0-20220926170735-60b7c6e9742e
)

14
go.sum
View File

@ -538,10 +538,24 @@ 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-20220922184533-be233f856791 h1:kLrF39Nhp2qBtW+YFWmkQ8UHIgrVZ1k4baVdEzrUqDs=
k8s.io/api v0.0.0-20220922184533-be233f856791/go.mod h1:qd3JkJgL4kOc9vpeehxgQWgM5jRR+g5KDXB1jTQCKss=
k8s.io/apimachinery v0.0.0-20220922184044-7fb78ee96289 h1:Y1uCEALGf5wi4ccjoxi4/84wKfj/A97zZtE2i2RPeuc=
k8s.io/apimachinery v0.0.0-20220922184044-7fb78ee96289/go.mod h1:zdDPkAEkslrVOG1IzqRpqLwHlA/W9IhQ6nE1h5IJ7ME=
k8s.io/cli-runtime v0.0.0-20220922193734-3141d5468ff0 h1:CTQY60RbuMCF4g6e+LF/pkzWVT5d2DW/tMz4vLm8+E0=
k8s.io/cli-runtime v0.0.0-20220922193734-3141d5468ff0/go.mod h1:7eqcsCEIkKu5i0t5Q69JkGawoIfam1Nq57P8Ardo7x8=
k8s.io/client-go v0.0.0-20220926163418-2f43d370b32c h1:bgMXhdg+VPC64NVYDF09m8y9VLuV2bnbnI2DBali2nw=
k8s.io/client-go v0.0.0-20220926163418-2f43d370b32c/go.mod h1:qz3xi6RjBK5mJeOFjoUc/2YyG00QSWqI1aiXktbV/gY=
k8s.io/component-base v0.0.0-20220928223046-40d14bdbd62f h1:aTHQeJTt6qjBdWHcwZZGDmuY1lT8H3UEOymxsFN3R0E=
k8s.io/component-base v0.0.0-20220928223046-40d14bdbd62f/go.mod h1:b/xON2XAu8Q9+AVl4ILaGlSShXh+mlSWulckMR9pYnU=
k8s.io/component-helpers v0.0.0-20220922190532-f4131335a651 h1:zib7nqMcPb5VHIo6BcVPKMiLsoWw6IRiglA4OL6GCjQ=
k8s.io/component-helpers v0.0.0-20220922190532-f4131335a651/go.mod h1:TO062E1rwf5mC4eLQRhN7UMYcyeO0Z/Tt42JHR2Gnko=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
k8s.io/metrics v0.0.0-20220926170735-60b7c6e9742e h1:w29gTphMlJCXO8B82QgfWdOOyk4QYC7TukiLmn01Y+k=
k8s.io/metrics v0.0.0-20220926170735-60b7c6e9742e/go.mod h1:RAddJkgtBdog6Gf5SMD0mBu3qFgptxMDNVC7j2it62A=
k8s.io/utils v0.0.0-20220922133306-665eaaec4324 h1:i+xdFemcSNuJvIfBlaYuXgRondKxK4z4prVPKzEaelI=
k8s.io/utils v0.0.0-20220922133306-665eaaec4324/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=