Skip to content

Commit 6a919f2

Browse files
authored
Merge pull request kubernetes#85903 from liggitt/disable-deprecated-apis
Remove ability to re-enable serving deprecated APIs
2 parents 6e38a0f + 5c63715 commit 6a919f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+32698
-49255
lines changed

api/openapi-spec/swagger.json

Lines changed: 28215 additions & 48077 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster/addons/calico-policy-controller/calico-cpva-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ rules:
88
- apiGroups: [""]
99
resources: ["nodes"]
1010
verbs: ["list"]
11-
- apiGroups: ["apps", "extensions"]
11+
- apiGroups: ["apps"]
1212
resources: ["deployments", "daemonsets"]
1313
verbs: ["patch"]

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ rules:
99
- apiGroups: [""]
1010
resources: ["configmaps"]
1111
verbs: ["get"]
12-
- apiGroups: ["apps", "extensions"]
12+
- apiGroups: ["apps"]
1313
resources: ["deployments/scale"]
1414
verbs: ["get", "update"]

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ rules:
88
- apiGroups: [""]
99
resources: ["nodes"]
1010
verbs: ["list"]
11-
- apiGroups: ["apps", "extensions"]
11+
- apiGroups: ["apps"]
1212
resources: ["deployments"]
1313
verbs: ["patch"]

cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ rules:
3333
- apiGroups: [""]
3434
resources: ["replicationcontrollers/scale"]
3535
verbs: ["get", "update"]
36-
- apiGroups: ["extensions","apps"]
36+
- apiGroups: ["apps"]
3737
resources: ["deployments/scale", "replicasets/scale"]
3838
verbs: ["get", "update"]
3939
# Remove the configmaps rule once below issue is fixed:

cluster/addons/fluentd-gcp/scaler-rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
addonmanager.kubernetes.io/mode: Reconcile
1818
rules:
1919
- apiGroups:
20-
- "extensions"
20+
- "apps"
2121
resources:
2222
- daemonsets
2323
verbs:

cluster/addons/rbac/cluster-autoscaler/cluster-autoscaler-rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ rules:
3535
- apiGroups: [""]
3636
resources: ["services", "replicationcontrollers", "persistentvolumes", "persistentvolumeclaims"]
3737
verbs: ["get", "list", "watch"]
38-
- apiGroups: ["apps", "extensions"]
38+
- apiGroups: ["apps"]
3939
resources: ["daemonsets", "replicasets"]
4040
verbs: ["get", "list", "watch"]
4141
- apiGroups: ["apps"]

cmd/kube-apiserver/app/aggregator.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,6 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
251251
// can reasonably expect seems questionable.
252252
{Group: "extensions", Version: "v1beta1"}: {group: 17900, version: 1},
253253
// to my knowledge, nothing below here collides
254-
{Group: "apps", Version: "v1beta1"}: {group: 17800, version: 1},
255-
{Group: "apps", Version: "v1beta2"}: {group: 17800, version: 9},
256254
{Group: "apps", Version: "v1"}: {group: 17800, version: 15},
257255
{Group: "events.k8s.io", Version: "v1beta1"}: {group: 17750, version: 5},
258256
{Group: "authentication.k8s.io", Version: "v1"}: {group: 17700, version: 15},

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ pkg/registry/core/service/portallocator/controller
172172
pkg/registry/core/service/storage
173173
pkg/registry/core/serviceaccount/storage
174174
pkg/registry/events/rest
175-
pkg/registry/extensions/controller/storage
176175
pkg/registry/extensions/rest
177176
pkg/registry/flowcontrol/rest
178177
pkg/registry/networking/rest

hack/.staticcheck_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ pkg/registry/core/resourcequota/storage
3131
pkg/registry/core/service/ipallocator
3232
pkg/registry/core/service/portallocator
3333
pkg/registry/core/service/storage
34-
pkg/registry/extensions/controller/storage
3534
pkg/util/coverage
3635
pkg/util/ebtables
3736
pkg/util/ipconfig

0 commit comments

Comments
 (0)