Skip to content

K
k3s
Commit 7be29bd9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51943 from CaoShuFeng/feature_gate

Automatic merge from submit-queue set AdvancedAuditing feature gate to true by default All feature commits are merged. The types are updated already to beta. This only enable the feature gate by default. **Release note**: ``` Promote the AdvancedAuditing feature to beta and enable the feature gate by default. ```
parents 8884f984 13884268
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
pkg/features/kube_features.go
View file @ 7be29bd9
...@@ -198,7 +198,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS ...@@ -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 // inherited features from generic apiserver, relisted here to get a conflict if it is changed
// unintentionally on either side: // unintentionally on either side:
genericfeatures.StreamingProxyRedirects: {Default: true, PreRelease: utilfeature.Beta}, 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.APIResponseCompression: {Default: false, PreRelease: utilfeature.Alpha},
genericfeatures.Initializers: {Default: false, PreRelease: utilfeature.Alpha}, genericfeatures.Initializers: {Default: false, PreRelease: utilfeature.Alpha},
genericfeatures.APIListChunking: {Default: false, PreRelease: utilfeature.Alpha}, genericfeatures.APIListChunking: {Default: false, PreRelease: utilfeature.Alpha},
......
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View file @ 7be29bd9
...@@ -36,6 +36,7 @@ const ( ...@@ -36,6 +36,7 @@ const (
// owner: @tallclair // owner: @tallclair
// alpha: v1.7 // alpha: v1.7
// beta: v1.8
// //
// AdvancedAuditing enables a much more general API auditing pipeline, which includes support for // 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 // pluggable output backends and an audit policy specifying how different requests should be
...@@ -72,7 +73,7 @@ func init() { ...@@ -72,7 +73,7 @@ func init() {
// available throughout Kubernetes binaries. // available throughout Kubernetes binaries.
var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureSpec{ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureSpec{
StreamingProxyRedirects: {Default: true, PreRelease: utilfeature.Beta}, StreamingProxyRedirects: {Default: true, PreRelease: utilfeature.Beta},
AdvancedAuditing: {Default: false, PreRelease: utilfeature.Alpha}, AdvancedAuditing: {Default: true, PreRelease: utilfeature.Beta},
APIResponseCompression: {Default: false, PreRelease: utilfeature.Alpha}, APIResponseCompression: {Default: false, PreRelease: utilfeature.Alpha},
Initializers: {Default: false, PreRelease: utilfeature.Alpha}, Initializers: {Default: false, PreRelease: utilfeature.Alpha},
APIListChunking: {Default: false, PreRelease: utilfeature.Alpha}, APIListChunking: {Default: false, PreRelease: utilfeature.Alpha},
......
staging/src/k8s.io/apiserver/pkg/server/options/audit.go
View file @ 7be29bd9
...@@ -57,8 +57,9 @@ type AuditOptions struct { ...@@ -57,8 +57,9 @@ type AuditOptions struct {
WebhookOptions AuditWebhookOptions WebhookOptions AuditWebhookOptions
} }
// AuditLogOptions holds the legacy audit log writer. If the AdvancedAuditing feature // AuditLogOptions determines the output of the structured audit log by default.
// is enabled, these options determine the output of the structured audit log. // If the AdvancedAuditing feature is set to false, AuditLogOptions holds the legacy
// audit log writer.
type AuditLogOptions struct { type AuditLogOptions struct {
Path string Path string
MaxAge int MaxAge int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment