Skip to content

Commit 54df1fd

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#94090 from deads2k/podpreset
remove pod presets
2 parents 73dda0a + 82ed033 commit 54df1fd

File tree

121 files changed

+197
-8099
lines changed

Some content is hidden

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

121 files changed

+197
-8099
lines changed

‎api/api-rules/violation_exceptions.list‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,6 @@ API rule violation: list_type_missing,k8s.io/api/rbac/v1beta1,PolicyRule,Resourc
257257
API rule violation: list_type_missing,k8s.io/api/rbac/v1beta1,PolicyRule,Verbs
258258
API rule violation: list_type_missing,k8s.io/api/rbac/v1beta1,Role,Rules
259259
API rule violation: list_type_missing,k8s.io/api/rbac/v1beta1,RoleBinding,Subjects
260-
API rule violation: list_type_missing,k8s.io/api/settings/v1alpha1,PodPresetSpec,Env
261-
API rule violation: list_type_missing,k8s.io/api/settings/v1alpha1,PodPresetSpec,EnvFrom
262-
API rule violation: list_type_missing,k8s.io/api/settings/v1alpha1,PodPresetSpec,VolumeMounts
263-
API rule violation: list_type_missing,k8s.io/api/settings/v1alpha1,PodPresetSpec,Volumes
264260
API rule violation: list_type_missing,k8s.io/api/storage/v1,CSINodeDriver,TopologyKeys
265261
API rule violation: list_type_missing,k8s.io/api/storage/v1,CSINodeSpec,Drivers
266262
API rule violation: list_type_missing,k8s.io/api/storage/v1,StorageClass,AllowedTopologies

‎api/openapi-spec/swagger.json‎

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

‎build/kazel_generated.bzl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ tags_values_pkgs = {"openapi-gen": {
7777
"staging/src/k8s.io/api/scheduling/v1",
7878
"staging/src/k8s.io/api/scheduling/v1alpha1",
7979
"staging/src/k8s.io/api/scheduling/v1beta1",
80-
"staging/src/k8s.io/api/settings/v1alpha1",
8180
"staging/src/k8s.io/api/storage/v1",
8281
"staging/src/k8s.io/api/storage/v1alpha1",
8382
"staging/src/k8s.io/api/storage/v1beta1",
@@ -161,7 +160,6 @@ tags_pkgs_values = {"openapi-gen": {
161160
"staging/src/k8s.io/api/scheduling/v1": ["true"],
162161
"staging/src/k8s.io/api/scheduling/v1alpha1": ["true"],
163162
"staging/src/k8s.io/api/scheduling/v1beta1": ["true"],
164-
"staging/src/k8s.io/api/settings/v1alpha1": ["true"],
165163
"staging/src/k8s.io/api/storage/v1": ["true"],
166164
"staging/src/k8s.io/api/storage/v1alpha1": ["true"],
167165
"staging/src/k8s.io/api/storage/v1beta1": ["true"],

‎cluster/gce/config-test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ fi
233233
if [[ "${MASTER_OS_DISTRIBUTION}" = 'gci' ]] || [[ "${MASTER_OS_DISTRIBUTION}" = 'ubuntu' ]]; then
234234
MASTER_KUBELET_TEST_ARGS="${MASTER_KUBELET_TEST_ARGS:-} --kernel-memcg-notification=true"
235235
fi
236-
APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-} --runtime-config=extensions/v1beta1,scheduling.k8s.io/v1alpha1,settings.k8s.io/v1alpha1 ${TEST_CLUSTER_DELETE_COLLECTION_WORKERS} ${TEST_CLUSTER_MAX_REQUESTS_INFLIGHT}"
236+
APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-} --runtime-config=extensions/v1beta1,scheduling.k8s.io/v1alpha1 ${TEST_CLUSTER_DELETE_COLLECTION_WORKERS} ${TEST_CLUSTER_MAX_REQUESTS_INFLIGHT}"
237237
CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS:-} ${TEST_CLUSTER_RESYNC_PERIOD} ${TEST_CLUSTER_API_CONTENT_TYPE}"
238238
SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}"
239239
KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}"
@@ -405,7 +405,7 @@ fi
405405
CUSTOM_INGRESS_YAML=${CUSTOM_INGRESS_YAML:-}
406406

407407
if [[ -z "${KUBE_ADMISSION_CONTROL:-}" ]]; then
408-
ADMISSION_CONTROL='NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection,PersistentVolumeClaimResize,RuntimeClass'
408+
ADMISSION_CONTROL='NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection,PersistentVolumeClaimResize,RuntimeClass'
409409
if [[ "${ENABLE_POD_SECURITY_POLICY:-}" = 'true' ]]; then
410410
ADMISSION_CONTROL="${ADMISSION_CONTROL},PodSecurityPolicy"
411411
fi

‎cluster/gce/gci/configure-helper.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,6 @@ function create-master-audit-policy {
10401040
- group: "policy"
10411041
- group: "rbac.authorization.k8s.io"
10421042
- group: "scheduling.k8s.io"
1043-
- group: "settings.k8s.io"
10441043
- group: "storage.k8s.io"'
10451044

10461045
cat <<EOF >"${path}"

‎cmd/kube-apiserver/app/aggregator.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
257257
{Group: "rbac.authorization.k8s.io", Version: "v1"}: {group: 17000, version: 15},
258258
{Group: "rbac.authorization.k8s.io", Version: "v1beta1"}: {group: 17000, version: 12},
259259
{Group: "rbac.authorization.k8s.io", Version: "v1alpha1"}: {group: 17000, version: 9},
260-
{Group: "settings.k8s.io", Version: "v1alpha1"}: {group: 16900, version: 9},
261260
{Group: "storage.k8s.io", Version: "v1"}: {group: 16800, version: 15},
262261
{Group: "storage.k8s.io", Version: "v1beta1"}: {group: 16800, version: 9},
263262
{Group: "storage.k8s.io", Version: "v1alpha1"}: {group: 16800, version: 1},

‎cmd/kube-controller-manager/app/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ go_library(
3838
"//pkg/apis/policy/install:go_default_library",
3939
"//pkg/apis/rbac/install:go_default_library",
4040
"//pkg/apis/scheduling/install:go_default_library",
41-
"//pkg/apis/settings/install:go_default_library",
4241
"//pkg/apis/storage/install:go_default_library",
4342
"//pkg/cloudprovider/providers:go_default_library",
4443
"//pkg/controller:go_default_library",

‎cmd/kube-controller-manager/app/import_known_versions.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,5 @@ import (
3434
_ "k8s.io/kubernetes/pkg/apis/policy/install"
3535
_ "k8s.io/kubernetes/pkg/apis/rbac/install"
3636
_ "k8s.io/kubernetes/pkg/apis/scheduling/install"
37-
_ "k8s.io/kubernetes/pkg/apis/settings/install"
3837
_ "k8s.io/kubernetes/pkg/apis/storage/install"
3938
)

‎hack/.golint_failures‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ pkg/registry/rbac/rolebinding/policybased
165165
pkg/registry/rbac/validation
166166
pkg/registry/registrytest
167167
pkg/registry/scheduling/rest
168-
pkg/registry/settings/rest
169168
pkg/registry/storage/rest
170169
pkg/registry/storage/storageclass
171170
pkg/scheduler/apis/config/v1
@@ -234,7 +233,6 @@ staging/src/k8s.io/api/rbac/v1alpha1
234233
staging/src/k8s.io/api/rbac/v1beta1
235234
staging/src/k8s.io/api/scheduling/v1alpha1
236235
staging/src/k8s.io/api/scheduling/v1beta1
237-
staging/src/k8s.io/api/settings/v1alpha1
238236
staging/src/k8s.io/api/storage/v1
239237
staging/src/k8s.io/api/storage/v1alpha1
240238
staging/src/k8s.io/api/storage/v1beta1

‎hack/.import-aliases‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"k8s.io/api/scheduling/v1": "schedulingv1",
3535
"k8s.io/api/scheduling/v1alpha1": "schedulingv1alpha1",
3636
"k8s.io/api/scheduling/v1beta1": "schedulingv1beta1",
37-
"k8s.io/api/settings/v1alpha1": "settingsv1alpha1",
3837
"k8s.io/api/storage/v1": "storagev1",
3938
"k8s.io/api/storage/v1alpha1": "storagev1alpha1",
4039
"k8s.io/api/storage/v1beta1": "storagev1beta1",

0 commit comments

Comments
 (0)