Skip to content

Commit db03ef6

Browse files
Merge pull request #126470 from benluddy/apiservingwithroutine-alpha-disabled
Move APIServingWithRoutine to alpha and disabled by default. Kubernetes-commit: f9d2297298909c9f3a2be2e88f3c84df43f3a376
2 parents dbb9b30 + c47cf43 commit db03ef6

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

go.mod

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ require (
4444
gopkg.in/evanphx/json-patch.v4 v4.12.0
4545
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4646
gopkg.in/square/go-jose.v2 v2.6.0
47-
k8s.io/api v0.0.0-20240724010313-f04ea0bc861d
48-
k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe
49-
k8s.io/client-go v0.0.0-20240724010704-ac9204c6195b
50-
k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440
47+
k8s.io/api v0.0.0-20240801003428-382a0912e579
48+
k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe
49+
k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9
50+
k8s.io/component-base v0.0.0-20240801005513-6332889bcf10
5151
k8s.io/klog/v2 v2.130.1
52-
k8s.io/kms v0.0.0-20240707024556-6e3528fa4c33
52+
k8s.io/kms v0.0.0-20240801005948-e16c35c51bb1
5353
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
5454
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
5555
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3
@@ -123,5 +123,3 @@ require (
123123
gopkg.in/yaml.v2 v2.4.0 // indirect
124124
gopkg.in/yaml.v3 v3.0.1 // indirect
125125
)
126-
127-
replace k8s.io/api => k8s.io/api v0.0.0-20240724010313-a789efa287e8

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
149149
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
150150
github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
151151
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
152-
github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
153-
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
152+
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
153+
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
154154
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
155155
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
156156
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -370,18 +370,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
370370
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
371371
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
372372
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
373-
k8s.io/api v0.0.0-20240724010313-a789efa287e8 h1:TISAHWnfAdn420WpN+fEHG6snbLbfaCAp3kHDoAkxIc=
374-
k8s.io/api v0.0.0-20240724010313-a789efa287e8/go.mod h1:ytlEzqC2wOTwYET71W7+J+k7O2V7vrDuzmNLBSpgT+k=
375-
k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe h1:V9MwpYUwbKlfLKVrhpVuKWiat/LBIhm1pGB9/xdHm5Q=
376-
k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
377-
k8s.io/client-go v0.0.0-20240724010704-ac9204c6195b h1:NTLYx38CAu+VstHvPLosqB6uSQUtSM+3Mqz2D/C5JpE=
378-
k8s.io/client-go v0.0.0-20240724010704-ac9204c6195b/go.mod h1:Y6CzOT21oLI4O66cjiV5oSSUgOL7gG/VCG9n8XI8OxU=
379-
k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440 h1:14X+5sRQRsul6tLxIKTP0/DotvWlMd9DFCgMqHP1hZY=
380-
k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440/go.mod h1:dj2Pl05aLcVMZi2NXcwv+M/WdUVPEkisFPjDze7rbSk=
373+
k8s.io/api v0.0.0-20240801003428-382a0912e579 h1:pElFtnw6/eJb1SLes+tbAqfL/7IezesSZ1bLTO+b2UE=
374+
k8s.io/api v0.0.0-20240801003428-382a0912e579/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
375+
k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ=
376+
k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
377+
k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9 h1:FtksMSsr8nNBmsSXlqvs3hPE/7BJ5wI/mJYjGypoEtk=
378+
k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9/go.mod h1:2bbCJ3Sd+yFlCoexz86XNKsJ8hBFUVTeHsjEhrODbfE=
379+
k8s.io/component-base v0.0.0-20240801005513-6332889bcf10 h1:tHph4IwKpAlb5BF1qvmAiZPsekcg7ulTIhHrGrw/OgY=
380+
k8s.io/component-base v0.0.0-20240801005513-6332889bcf10/go.mod h1:4BSQhq9G+cFOChP5FQhxewvI8nzmsOPyetLz/Gh2Npw=
381381
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
382382
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
383-
k8s.io/kms v0.0.0-20240707024556-6e3528fa4c33 h1:Wd/sRvKMgzuCdkZ/WQg2rg/j6NLW8eyw0RK8AhV9Hak=
384-
k8s.io/kms v0.0.0-20240707024556-6e3528fa4c33/go.mod h1:x2EJv5lkGE18ijjE04e8W0fVyRPfAx5flo9WdY7a1Hw=
383+
k8s.io/kms v0.0.0-20240801005948-e16c35c51bb1 h1:ToX+umZJUKsSS1RwlLTgst6ZlI+1U6CvD1LNpzjUTSw=
384+
k8s.io/kms v0.0.0-20240801005948-e16c35c51bb1/go.mod h1:x2EJv5lkGE18ijjE04e8W0fVyRPfAx5flo9WdY7a1Hw=
385385
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
386386
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
387387
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=

pkg/features/kube_features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
360360

361361
APIServerTracing: {Default: true, PreRelease: featuregate.Beta},
362362

363-
APIServingWithRoutine: {Default: true, PreRelease: featuregate.Beta},
363+
APIServingWithRoutine: {Default: false, PreRelease: featuregate.Alpha},
364364

365365
AuthorizeWithSelectors: {Default: false, PreRelease: featuregate.Alpha},
366366

0 commit comments

Comments
 (0)