diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 711588e80eb..35a90a1ac25 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -198,7 +198,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS // inherited features from generic apiserver, relisted here to get a conflict if it is changed // unintentionally on either side: genericfeatures.StreamingProxyRedirects: {Default: true, PreRelease: utilfeature.Beta}, - genericfeatures.AdvancedAuditing: {Default: false, PreRelease: utilfeature.Alpha}, + genericfeatures.AdvancedAuditing: {Default: true, PreRelease: utilfeature.Beta}, genericfeatures.APIResponseCompression: {Default: false, PreRelease: utilfeature.Alpha}, genericfeatures.Initializers: {Default: false, PreRelease: utilfeature.Alpha}, genericfeatures.APIListChunking: {Default: false, PreRelease: utilfeature.Alpha}, diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index c2153184a61..d5b52fd8758 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -36,6 +36,7 @@ const ( // owner: @tallclair // alpha: v1.7 + // beta: v1.8 // // AdvancedAuditing enables a much more general API auditing pipeline, which includes support for // pluggable output backends and an audit policy specifying how different requests should be @@ -72,7 +73,7 @@ func init() { // available throughout Kubernetes binaries. var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureSpec{ StreamingProxyRedirects: {Default: true, PreRelease: utilfeature.Beta}, - AdvancedAuditing: {Default: false, PreRelease: utilfeature.Alpha}, + AdvancedAuditing: {Default: true, PreRelease: utilfeature.Beta}, APIResponseCompression: {Default: false, PreRelease: utilfeature.Alpha}, Initializers: {Default: false, PreRelease: utilfeature.Alpha}, APIListChunking: {Default: false, PreRelease: utilfeature.Alpha}, diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/audit.go b/staging/src/k8s.io/apiserver/pkg/server/options/audit.go index 8de3e27026d..3ccb275428b 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/audit.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/audit.go @@ -57,8 +57,9 @@ type AuditOptions struct { WebhookOptions AuditWebhookOptions } -// AuditLogOptions holds the legacy audit log writer. If the AdvancedAuditing feature -// is enabled, these options determine the output of the structured audit log. +// AuditLogOptions determines the output of the structured audit log by default. +// If the AdvancedAuditing feature is set to false, AuditLogOptions holds the legacy +// audit log writer. type AuditLogOptions struct { Path string MaxAge int