kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100139 from Jefftree/ssa-ga2 

Promote SSA GA

Kubernetes-commit: 6067d8556a017102fcd92c6a06738524c36847a9
This commit is contained in:
Kubernetes Publisher 2021-04-24 21:39:00 -07:00
parent 9427d805d6 285024a6b7
commit 16ed1713d9
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -920,15 +920,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "95cee4894d89"
"Rev": "c8d93accf11b"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "ec059b16b345"
"Rev": "83ce8f09cbfc"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "d3fbdeba9a5e"
"Rev": "47b3cad4dece"
},
{
"ImportPath": "k8s.io/component-base",

12
go.mod
View File

@ -38,9 +38,9 @@ require (
google.golang.org/grpc v1.27.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20210518101556-95cee4894d89
k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345
k8s.io/client-go v0.0.0-20210518102906-d3fbdeba9a5e
k8s.io/api v0.0.0-20210518101558-c8d93accf11b
k8s.io/apimachinery v0.0.0-20210518100453-83ce8f09cbfc
k8s.io/client-go v0.0.0-20210518102909-47b3cad4dece
k8s.io/component-base v0.0.0-20210518111232-44faecbf614e
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
@ -51,8 +51,8 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210518101556-95cee4894d89
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102906-d3fbdeba9a5e
k8s.io/api => k8s.io/api v0.0.0-20210518101558-c8d93accf11b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100453-83ce8f09cbfc
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102909-47b3cad4dece
k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111232-44faecbf614e
)

12
go.sum
View File

@ -674,12 +674,12 @@ 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 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210518101556-95cee4894d89 h1:uQC3v+9tBtiF1mXGGdM3vN7gDW7StAJCFO4sO0USjhE=
k8s.io/api v0.0.0-20210518101556-95cee4894d89/go.mod h1:ZFbvp5WWMe1V9auNefRgVPZzDDSzTMLlulKIDnadhQU=
k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345 h1:oZsYo/CKdpQiJIYzlW07FuZK8UE43taXkz+pS9H0Phg=
k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs=
k8s.io/client-go v0.0.0-20210518102906-d3fbdeba9a5e h1:jft/qLADXRQ2PLEPddJGuE4IE7gLGp703t67iOxQM/Y=
k8s.io/client-go v0.0.0-20210518102906-d3fbdeba9a5e/go.mod h1:moENc77cVcXNqvd2/0xRbARMIRzTfo9HrOWpG0JizNw=
k8s.io/api v0.0.0-20210518101558-c8d93accf11b h1:VtbixdRYalapRyv8XWqQ0ivasSzmGqWkjmMulaxzsQI=
k8s.io/api v0.0.0-20210518101558-c8d93accf11b/go.mod h1:7kPISXZZL69K86qCGf1GAOKDaL2Ki9I8FwkDc5kgTtY=
k8s.io/apimachinery v0.0.0-20210518100453-83ce8f09cbfc h1:wUEXk+EGeYl98HHTip3czVEQXs9QIfuHbYgB5lI5T8c=
k8s.io/apimachinery v0.0.0-20210518100453-83ce8f09cbfc/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs=
k8s.io/client-go v0.0.0-20210518102909-47b3cad4dece h1:bIgUFaeIJhVZLCFzawJlpUUCtDPyYFMFJg1Q56DretM=
k8s.io/client-go v0.0.0-20210518102909-47b3cad4dece/go.mod h1:rENgaqPybZsXwBywgsoDXFB7kwubBS4juzSyZNWeFTE=
k8s.io/component-base v0.0.0-20210518111232-44faecbf614e h1:+LvsEqL+o2/s3SNrTdZm22miglZOm3TPof8oO5pa2F8=
k8s.io/component-base v0.0.0-20210518111232-44faecbf614e/go.mod h1:VYU6k+gXEg7lXm+XCubCKvSlHHI9l+JHRJ0Hw4nrjug=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

3
pkg/features/kube_features.go
View File

@ -95,6 +95,7 @@ const (
// owner: @apelisse, @lavalamp
// alpha: v1.14
// beta: v1.16
// stable: v1.22
//
// Server-side apply. Merging happens on the server.
ServerSideApply featuregate.Feature = "ServerSideApply"
@ -178,7 +179,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
APIListChunking: {Default: true, PreRelease: featuregate.Beta},
DryRun: {Default: true, PreRelease: featuregate.GA},
RemainingItemCount: {Default: true, PreRelease: featuregate.Beta},
ServerSideApply: {Default: true, PreRelease: featuregate.Beta},
ServerSideApply: {Default: true, PreRelease: featuregate.GA},
StorageVersionHash: {Default: true, PreRelease: featuregate.Beta},
StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha},
WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},