Skip to content

Commit d1586ea

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#91502 from deads2k/dyn-audit-removal-00
remove --feature-gates=DynamicAuditing
2 parents 5b1d785 + e857adb commit d1586ea

File tree

137 files changed

+16
-10569
lines changed

Some content is hidden

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

137 files changed

+16
-10569
lines changed

‎api/api-rules/violation_exceptions.list‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ API rule violation: list_type_missing,k8s.io/api/apps/v1beta2,DeploymentStatus,C
3333
API rule violation: list_type_missing,k8s.io/api/apps/v1beta2,ReplicaSetStatus,Conditions
3434
API rule violation: list_type_missing,k8s.io/api/apps/v1beta2,StatefulSetSpec,VolumeClaimTemplates
3535
API rule violation: list_type_missing,k8s.io/api/apps/v1beta2,StatefulSetStatus,Conditions
36-
API rule violation: list_type_missing,k8s.io/api/auditregistration/v1alpha1,Policy,Stages
37-
API rule violation: list_type_missing,k8s.io/api/auditregistration/v1alpha1,WebhookClientConfig,CABundle
3836
API rule violation: list_type_missing,k8s.io/api/authentication/v1,TokenRequestSpec,Audiences
3937
API rule violation: list_type_missing,k8s.io/api/authentication/v1,TokenReviewSpec,Audiences
4038
API rule violation: list_type_missing,k8s.io/api/authentication/v1,TokenReviewStatus,Audiences

‎api/openapi-spec/swagger.json‎

Lines changed: 0 additions & 1044 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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ tags_values_pkgs = {"openapi-gen": {
3838
"cmd/cloud-controller-manager/app/apis/config/v1alpha1",
3939
"pkg/apis/abac/v0",
4040
"pkg/apis/abac/v1beta1",
41-
"pkg/apis/auditregistration",
4241
"staging/src/k8s.io/api/admissionregistration/v1",
4342
"staging/src/k8s.io/api/admissionregistration/v1beta1",
4443
"staging/src/k8s.io/api/apps/v1",
4544
"staging/src/k8s.io/api/apps/v1beta1",
4645
"staging/src/k8s.io/api/apps/v1beta2",
47-
"staging/src/k8s.io/api/auditregistration/v1alpha1",
4846
"staging/src/k8s.io/api/authentication/v1",
4947
"staging/src/k8s.io/api/authentication/v1beta1",
5048
"staging/src/k8s.io/api/authorization/v1",
@@ -116,15 +114,13 @@ tags_pkgs_values = {"openapi-gen": {
116114
"cmd/cloud-controller-manager/app/apis/config/v1alpha1": ["true"],
117115
"pkg/apis/abac/v0": ["true"],
118116
"pkg/apis/abac/v1beta1": ["true"],
119-
"pkg/apis/auditregistration": ["true"],
120117
"staging/src/k8s.io/api/admission/v1": ["false"],
121118
"staging/src/k8s.io/api/admission/v1beta1": ["false"],
122119
"staging/src/k8s.io/api/admissionregistration/v1": ["true"],
123120
"staging/src/k8s.io/api/admissionregistration/v1beta1": ["true"],
124121
"staging/src/k8s.io/api/apps/v1": ["true"],
125122
"staging/src/k8s.io/api/apps/v1beta1": ["true"],
126123
"staging/src/k8s.io/api/apps/v1beta2": ["true"],
127-
"staging/src/k8s.io/api/auditregistration/v1alpha1": ["true"],
128124
"staging/src/k8s.io/api/authentication/v1": ["true"],
129125
"staging/src/k8s.io/api/authentication/v1beta1": ["true"],
130126
"staging/src/k8s.io/api/authorization/v1": ["true"],

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
283283
{Group: "scheduling.k8s.io", Version: "v1alpha1"}: {group: 16600, version: 9},
284284
{Group: "coordination.k8s.io", Version: "v1"}: {group: 16500, version: 15},
285285
{Group: "coordination.k8s.io", Version: "v1beta1"}: {group: 16500, version: 9},
286-
{Group: "auditregistration.k8s.io", Version: "v1alpha1"}: {group: 16400, version: 1},
287286
{Group: "node.k8s.io", Version: "v1alpha1"}: {group: 16300, version: 1},
288287
{Group: "node.k8s.io", Version: "v1beta1"}: {group: 16300, version: 9},
289288
{Group: "discovery.k8s.io", Version: "v1beta1"}: {group: 16200, version: 12},

‎cmd/kube-apiserver/app/options/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ go_test(
6060
"//staging/src/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",
6161
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
6262
"//staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered:go_default_library",
63-
"//staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic:go_default_library",
6463
"//staging/src/k8s.io/apiserver/plugin/pkg/audit/truncate:go_default_library",
6564
"//staging/src/k8s.io/client-go/rest:go_default_library",
6665
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",

‎cmd/kube-apiserver/app/options/options_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
apiserveroptions "k8s.io/apiserver/pkg/server/options"
3131
"k8s.io/apiserver/pkg/storage/storagebackend"
3232
auditbuffered "k8s.io/apiserver/plugin/pkg/audit/buffered"
33-
auditdynamic "k8s.io/apiserver/plugin/pkg/audit/dynamic"
3433
audittruncate "k8s.io/apiserver/plugin/pkg/audit/truncate"
3534
restclient "k8s.io/client-go/rest"
3635
cliflag "k8s.io/component-base/cli/flag"
@@ -252,9 +251,6 @@ func TestAddFlags(t *testing.T) {
252251
InitialBackoff: 2 * time.Second,
253252
GroupVersionString: "audit.k8s.io/v1alpha1",
254253
},
255-
DynamicOptions: apiserveroptions.AuditDynamicOptions{
256-
BatchConfig: auditdynamic.NewDefaultWebhookBatchConfig(),
257-
},
258254
PolicyFile: "/policy",
259255
},
260256
Features: &apiserveroptions.FeatureOptions{

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

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -505,29 +505,17 @@ func buildGenericConfig(
505505
genericConfig.DisabledPostStartHooks.Insert(rbacrest.PostStartHookName)
506506
}
507507

508+
lastErr = s.Audit.ApplyTo(genericConfig)
509+
if lastErr != nil {
510+
return
511+
}
512+
508513
admissionConfig := &kubeapiserveradmission.Config{
509514
ExternalInformers: versionedInformers,
510515
LoopbackClientConfig: genericConfig.LoopbackClientConfig,
511516
CloudConfigFile: s.CloudProvider.CloudConfigFile,
512517
}
513518
serviceResolver = buildServiceResolver(s.EnableAggregatorRouting, genericConfig.LoopbackClientConfig.Host, versionedInformers)
514-
515-
authInfoResolverWrapper := webhook.NewDefaultAuthenticationInfoResolverWrapper(proxyTransport, genericConfig.EgressSelector, genericConfig.LoopbackClientConfig)
516-
517-
lastErr = s.Audit.ApplyTo(
518-
genericConfig,
519-
genericConfig.LoopbackClientConfig,
520-
versionedInformers,
521-
serveroptions.NewProcessInfo("kube-apiserver", "kube-system"),
522-
&serveroptions.WebhookOptions{
523-
AuthInfoResolverWrapper: authInfoResolverWrapper,
524-
ServiceResolver: serviceResolver,
525-
},
526-
)
527-
if lastErr != nil {
528-
return
529-
}
530-
531519
pluginInitializers, admissionPostStartHook, err = admissionConfig.New(proxyTransport, genericConfig.EgressSelector, serviceResolver)
532520
if err != nil {
533521
lastErr = fmt.Errorf("failed to create admission plugin initializer: %v", err)

‎hack/.golint_failures‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ pkg/apis/admissionregistration/validation
1212
pkg/apis/apps/v1
1313
pkg/apis/apps/v1beta1
1414
pkg/apis/apps/v1beta2
15-
pkg/apis/auditregistration/v1alpha1
1615
pkg/apis/authentication/v1
1716
pkg/apis/autoscaling/v1
1817
pkg/apis/autoscaling/v2beta1
@@ -125,7 +124,6 @@ pkg/proxy/userspace
125124
pkg/proxy/winkernel
126125
pkg/proxy/winuserspace
127126
pkg/registry/admissionregistration/rest
128-
pkg/registry/auditregistration/rest
129127
pkg/registry/authentication/rest
130128
pkg/registry/authentication/tokenreview
131129
pkg/registry/authorization/localsubjectaccessreview
@@ -217,7 +215,6 @@ staging/src/k8s.io/api/admissionregistration/v1beta1
217215
staging/src/k8s.io/api/apps/v1
218216
staging/src/k8s.io/api/apps/v1beta1
219217
staging/src/k8s.io/api/apps/v1beta2
220-
staging/src/k8s.io/api/auditregistration/v1alpha1
221218
staging/src/k8s.io/api/authentication/v1
222219
staging/src/k8s.io/api/authentication/v1beta1
223220
staging/src/k8s.io/api/authorization/v1

‎hack/.import-aliases‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"k8s.io/api/apps/v1": "appsv1",
77
"k8s.io/api/apps/v1beta1": "appsv1beta1",
88
"k8s.io/api/apps/v1beta2": "appsv1beta2",
9-
"k8s.io/api/auditregistration/v1alpha1": "auditregistrationv1alpha1",
109
"k8s.io/api/authentication/v1": "authenticationv1",
1110
"k8s.io/api/authentication/v1beta1": "authenticationv1beta1",
1211
"k8s.io/api/authorization/v1": "authorizationv1",

‎hack/lib/init.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ admission.k8s.io/v1beta1 \
7070
apps/v1 \
7171
apps/v1beta1 \
7272
apps/v1beta2 \
73-
auditregistration.k8s.io/v1alpha1 \
7473
authentication.k8s.io/v1 \
7574
authentication.k8s.io/v1beta1 \
7675
authorization.k8s.io/v1 \

0 commit comments

Comments
 (0)