Merge pull request #105057 from jiahuif-forks/feature/enum-types-feature-enablement

Add Support for OpenAPIEnum in OpenAPI v2

Kubernetes-commit: e14bdbaa1c4ed2b31dbce1b03160402483d26889
This commit is contained in:
Kubernetes Publisher 2021-11-16 16:35:55 -08:00
commit 0ad8ed0216
2 changed files with 35 additions and 33 deletions

32
go.mod
View File

@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20211116232201-3ba85978261d
k8s.io/apimachinery v0.0.0-20211116191949-10158cf6d3ff
k8s.io/cli-runtime v0.0.0-20211113000837-3353a80fdd57
k8s.io/client-go v0.0.0-20211116232531-d9ceca58715c
k8s.io/component-base v0.0.0-20211115192801-2ba78dffde88
k8s.io/component-helpers v0.0.0-20211112155227-f6f6db02ccda
k8s.io/api v0.0.0-20211117032144-b7adf12040d3
k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da
k8s.io/cli-runtime v0.0.0-20211117034834-783c71acdfd9
k8s.io/client-go v0.0.0-20211117032455-e2c9d634d6ba
k8s.io/component-base v0.0.0-20211117033035-2a12018533a2
k8s.io/component-helpers v0.0.0-20211117033155-b70f8e754916
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211105084753-ee342a809c29
k8s.io/metrics v0.0.0-20211111231549-670a06559996
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/metrics v0.0.0-20211117034700-15f62f02dd23
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
sigs.k8s.io/kustomize/kustomize/v4 v4.4.1
sigs.k8s.io/kustomize/kyaml v0.13.0
@ -47,12 +47,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211116232201-3ba85978261d
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211116191949-10158cf6d3ff
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211113000837-3353a80fdd57
k8s.io/client-go => k8s.io/client-go v0.0.0-20211116232531-d9ceca58715c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211111071655-7b5df4132daf
k8s.io/component-base => k8s.io/component-base v0.0.0-20211115192801-2ba78dffde88
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211112155227-f6f6db02ccda
k8s.io/metrics => k8s.io/metrics v0.0.0-20211111231549-670a06559996
k8s.io/api => k8s.io/api v0.0.0-20211117032144-b7adf12040d3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211117034834-783c71acdfd9
k8s.io/client-go => k8s.io/client-go v0.0.0-20211117032455-e2c9d634d6ba
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211117031727-bce3d85553ae
k8s.io/component-base => k8s.io/component-base v0.0.0-20211117033035-2a12018533a2
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211117033155-b70f8e754916
k8s.io/metrics => k8s.io/metrics v0.0.0-20211117034700-15f62f02dd23
)

36
go.sum
View File

@ -138,6 +138,7 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE=
github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
@ -249,6 +250,7 @@ github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2c
github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=
github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
@ -909,19 +911,19 @@ 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-20211116232201-3ba85978261d h1:1nPNhVa28WnzWaJ42b49kcwa05Z2qqxcqPYD0OEHQJ8=
k8s.io/api v0.0.0-20211116232201-3ba85978261d/go.mod h1:EgyfCRAySNu6W9i8g81nY2/AJR7UVniCSHwGWPDshGs=
k8s.io/apimachinery v0.0.0-20211116191949-10158cf6d3ff h1:48ZHXvUs3bTxiEDlE97wNDgMMCRLmVdqV+/W2d7Hvpg=
k8s.io/apimachinery v0.0.0-20211116191949-10158cf6d3ff/go.mod h1:/fTTuFZJpMy6M4dc6F6QbWWj88D/Yd/ZdqJMvTIcbkE=
k8s.io/cli-runtime v0.0.0-20211113000837-3353a80fdd57 h1:FfOBlRUNisClngHiIBDEyTW5N2yEbKy1/KsNSgwYZSk=
k8s.io/cli-runtime v0.0.0-20211113000837-3353a80fdd57/go.mod h1:aityjoTxZbPYy/7mU1LOCtwGFSCt2chNtENDPWtlOP8=
k8s.io/client-go v0.0.0-20211116232531-d9ceca58715c h1:SDq4/91oIjf7l+P75rjlP5jOa+XP56qTzaD9RcQheDU=
k8s.io/client-go v0.0.0-20211116232531-d9ceca58715c/go.mod h1:ucUV9EL6PE378vUCjYaoKbFsIcXbO4ObSfCOKgoj/88=
k8s.io/code-generator v0.0.0-20211111071655-7b5df4132daf/go.mod h1:elIIhU8sF9q1YQFV7vZBy0EXwIqmRQ1K0HjPRxMHdEQ=
k8s.io/component-base v0.0.0-20211115192801-2ba78dffde88 h1:Vx0Rn2Mw8GS2IlGhN5SMRhU9WIm4jnCkruJwGZLYYGE=
k8s.io/component-base v0.0.0-20211115192801-2ba78dffde88/go.mod h1:1FNCGI8+JFGNYTnOJidyT0C6gBaT3hZp0P5Nv/9NKr8=
k8s.io/component-helpers v0.0.0-20211112155227-f6f6db02ccda h1:xRczbjh1GdYEWIB5fSfhtp0BrPxlgdTU5Kg1Qcis47g=
k8s.io/component-helpers v0.0.0-20211112155227-f6f6db02ccda/go.mod h1:l09fxADyldPge7DGxb+fkLNcs3yj0OR9w/NVY76ejB8=
k8s.io/api v0.0.0-20211117032144-b7adf12040d3 h1:OUKo3mc2wSOr2GGk0MiMWhZOca1INVHD0Ol0zHOmlKU=
k8s.io/api v0.0.0-20211117032144-b7adf12040d3/go.mod h1:B1McGV/Uyv/c0sGZKsHMP4FArbyZZ8Emx+a7h5d/tMs=
k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da h1:7W2cMPNnhm4snbd4zGcOBzi233V4+x1jHHeDq2Fr/nE=
k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da/go.mod h1:SqloDTPqePPNhEp8K4qUgqpKc3tE+ymn05iIUbSAQ7g=
k8s.io/cli-runtime v0.0.0-20211117034834-783c71acdfd9 h1:6B2k1jJ7IagpGd7V8vM14pGFCirQ5/e+9DD3+3xJoqk=
k8s.io/cli-runtime v0.0.0-20211117034834-783c71acdfd9/go.mod h1:JYYKDMAnJALQKGBaivu4nJEZ4xaY2m7xO0Y4/RE0jQw=
k8s.io/client-go v0.0.0-20211117032455-e2c9d634d6ba h1:50gtTEoxTr6LY/cqZ5POZzXjpIH9ls1r+LlioQz7r7E=
k8s.io/client-go v0.0.0-20211117032455-e2c9d634d6ba/go.mod h1:/6rSxWdcMfCPQ+BnsLCvWe5BDUArFuNGE4x2m7q2zqc=
k8s.io/code-generator v0.0.0-20211117031727-bce3d85553ae/go.mod h1:mObJbeTbuUA4VfVCtZI0nS/oLJRp+s2A07sH+fMregI=
k8s.io/component-base v0.0.0-20211117033035-2a12018533a2 h1:Eq5F+Yl0w7BUS2I1rrij995N9L/QaHUuv+wmjCNy1jQ=
k8s.io/component-base v0.0.0-20211117033035-2a12018533a2/go.mod h1:M8S6yaytGn7h1Xxa64Mk0MrYcKPEDf2R1ynxXfbUKDM=
k8s.io/component-helpers v0.0.0-20211117033155-b70f8e754916 h1:BvaJbbQ37VlQdscu/B2Gk3e1qfr6ivEPL7uJGg7a0O4=
k8s.io/component-helpers v0.0.0-20211117033155-b70f8e754916/go.mod h1:Mupxky2BdZz11gPnA0/inwT4SEY9Y7P5PAOOBHQCWa4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -929,10 +931,10 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=
k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/kube-openapi v0.0.0-20211105084753-ee342a809c29 h1:SgxutK76kGA2O/LIjRjoJ2ABggpGJlaJOiLyOdCjEsU=
k8s.io/kube-openapi v0.0.0-20211105084753-ee342a809c29/go.mod h1:X90lRFlqk35/w9FG4WIvZqMPfG3WrZGzdlSaL6uh7rc=
k8s.io/metrics v0.0.0-20211111231549-670a06559996 h1:FjoTIPhFePhKnhTxBjpeRr0Z5yu6w6FJxzjuE5vFpyo=
k8s.io/metrics v0.0.0-20211111231549-670a06559996/go.mod h1:U223BQblZweDx/GR/JnaB2RdAXVNsUY8w4LhxJdaNnY=
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
k8s.io/metrics v0.0.0-20211117034700-15f62f02dd23 h1:ZO6/ptkxc2PgRB5zNWVaJe/ArV//ayog5pUoe1cfJN8=
k8s.io/metrics v0.0.0-20211117034700-15f62f02dd23/go.mod h1:JXQ0xRsyqeZ+HmOOb9LT8P0wPQiWHiEZ9Y169vt8tts=
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=