From 589446da5db4508119aeda58b8e66e38c218f6f5 Mon Sep 17 00:00:00 2001 From: Khaled Emara Date: Mon, 5 Feb 2024 18:31:08 +0200 Subject: [PATCH] chore(globalcontext): drop globalcontext flag (#9652) Signed-off-by: Khaled Emara Co-authored-by: shuting --- charts/kyverno/README.md | 1 - charts/kyverno/templates/_helpers.tpl | 1 - charts/kyverno/values.yaml | 2 -- cmd/background-controller/main.go | 1 - cmd/cleanup-controller/main.go | 1 - cmd/internal/config.go | 12 ------------ cmd/internal/flag.go | 8 -------- cmd/kyverno/main.go | 1 - cmd/reports-controller/main.go | 1 - config/install-latest-testing.yaml | 4 ---- 10 files changed, 32 deletions(-) diff --git a/charts/kyverno/README.md b/charts/kyverno/README.md index b1d56402f0..f8fe83ee0e 100644 --- a/charts/kyverno/README.md +++ b/charts/kyverno/README.md @@ -334,7 +334,6 @@ The chart values are organised per component. | features.dumpPayload.enabled | bool | `false` | Enables the feature | | features.forceFailurePolicyIgnore.enabled | bool | `false` | Enables the feature | | features.generateValidatingAdmissionPolicy.enabled | bool | `false` | Enables the feature | -| features.globalContext.enabled | bool | `true` | Enables the feature | | features.globalContext.maxApiCallResponseLength | int | `2000000` | Maximum allowed response size from API Calls. A value of 0 bypasses checks (not recommended) | | features.logging.format | string | `"text"` | Logging format | | features.logging.verbosity | int | `2` | Logging verbosity | diff --git a/charts/kyverno/templates/_helpers.tpl b/charts/kyverno/templates/_helpers.tpl index 5c4d04de47..ceafb762e6 100644 --- a/charts/kyverno/templates/_helpers.tpl +++ b/charts/kyverno/templates/_helpers.tpl @@ -47,7 +47,6 @@ {{- $flags = append $flags (print "--generateValidatingAdmissionPolicy=" .enabled) -}} {{- end -}} {{- with .globalContext -}} - {{- $flags = append $flags (print "--enableGlobalContext=" .enabled) -}} {{- $flags = append $flags (print "--maxAPICallResponseLength=" (int .maxApiCallResponseLength)) -}} {{- end -}} {{- with .logging -}} diff --git a/charts/kyverno/values.yaml b/charts/kyverno/values.yaml index 3a459ef6d7..9f3e15168f 100644 --- a/charts/kyverno/values.yaml +++ b/charts/kyverno/values.yaml @@ -630,8 +630,6 @@ features: # -- Enables the feature enabled: false globalContext: - # -- Enables the feature - enabled: true # -- Maximum allowed response size from API Calls. A value of 0 bypasses checks (not recommended) maxApiCallResponseLength: 2000000 logging: diff --git a/cmd/background-controller/main.go b/cmd/background-controller/main.go index 7c4387c5f1..0ae6e2884b 100644 --- a/cmd/background-controller/main.go +++ b/cmd/background-controller/main.go @@ -117,7 +117,6 @@ func main() { internal.WithKyvernoDynamicClient(), internal.WithEventsClient(), internal.WithApiServerClient(), - internal.WithGlobalContext(), internal.WithFlagSets(flagset), ) // parse flags diff --git a/cmd/cleanup-controller/main.go b/cmd/cleanup-controller/main.go index 507995bde7..25c86bdb56 100644 --- a/cmd/cleanup-controller/main.go +++ b/cmd/cleanup-controller/main.go @@ -105,7 +105,6 @@ func main() { internal.WithDeferredLoading(), internal.WithMetadataClient(), internal.WithApiServerClient(), - internal.WithGlobalContext(), internal.WithFlagSets(flagset), ) // parse flags diff --git a/cmd/internal/config.go b/cmd/internal/config.go index 58e43dd02c..be92d66aee 100644 --- a/cmd/internal/config.go +++ b/cmd/internal/config.go @@ -22,7 +22,6 @@ type Configuration interface { UsesMetadataClient() bool UsesKyvernoDynamicClient() bool UsesEventsClient() bool - UsesGlobalContext() bool FlagSets() []*flag.FlagSet } @@ -140,12 +139,6 @@ func WithEventsClient() ConfigurationOption { } } -func WithGlobalContext() ConfigurationOption { - return func(c *configuration) { - c.usesGlobalContext = true - } -} - func WithFlagSets(flagsets ...*flag.FlagSet) ConfigurationOption { return func(c *configuration) { c.flagSets = append(c.flagSets, flagsets...) @@ -170,7 +163,6 @@ type configuration struct { usesMetadataClient bool usesKyvernoDynamicClient bool usesEventsClient bool - usesGlobalContext bool flagSets []*flag.FlagSet } @@ -242,10 +234,6 @@ func (c *configuration) UsesEventsClient() bool { return c.usesEventsClient } -func (c *configuration) UsesGlobalContext() bool { - return c.usesGlobalContext -} - func (c *configuration) FlagSets() []*flag.FlagSet { return c.flagSets } diff --git a/cmd/internal/flag.go b/cmd/internal/flag.go index 0795324386..357e2a9672 100644 --- a/cmd/internal/flag.go +++ b/cmd/internal/flag.go @@ -137,10 +137,6 @@ func initCleanupFlags() { flag.StringVar(&cleanupServerPort, "cleanupServerPort", "9443", "kyverno cleanup server port, defaults to '9443'.") } -func initGlobalContextFlags() { - flag.BoolVar(&enableGlobalContext, "enableGlobalContext", true, "Enable global context feature.") -} - type options struct { clientRateLimitQPS float64 clientRateLimitBurst int @@ -224,10 +220,6 @@ func initFlags(config Configuration, opts ...Option) { if config.UsesLeaderElection() { initLeaderElectionFlags() } - // leader election - if config.UsesGlobalContext() { - initGlobalContextFlags() - } initCleanupFlags() for _, flagset := range config.FlagSets() { flagset.VisitAll(func(f *flag.Flag) { diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go index 719fa8ced9..c1992f60c5 100644 --- a/cmd/kyverno/main.go +++ b/cmd/kyverno/main.go @@ -292,7 +292,6 @@ func main() { internal.WithKyvernoDynamicClient(), internal.WithEventsClient(), internal.WithApiServerClient(), - internal.WithGlobalContext(), internal.WithFlagSets(flagset), ) // parse flags diff --git a/cmd/reports-controller/main.go b/cmd/reports-controller/main.go index 6ec0525065..8442a70c95 100644 --- a/cmd/reports-controller/main.go +++ b/cmd/reports-controller/main.go @@ -244,7 +244,6 @@ func main() { internal.WithKyvernoDynamicClient(), internal.WithEventsClient(), internal.WithApiServerClient(), - internal.WithGlobalContext(), internal.WithFlagSets(flagset), ) // parse flags diff --git a/config/install-latest-testing.yaml b/config/install-latest-testing.yaml index 701e80b53e..defe5cf88e 100644 --- a/config/install-latest-testing.yaml +++ b/config/install-latest-testing.yaml @@ -52541,7 +52541,6 @@ spec: - --dumpPayload=false - --forceFailurePolicyIgnore=false - --generateValidatingAdmissionPolicy=false - - --enableGlobalContext=true - --maxAPICallResponseLength=2000000 - --loggingFormat=text - --v=2 @@ -52694,7 +52693,6 @@ spec: - --metricsPort=8000 - --enableConfigMapCaching=true - --enableDeferredLoading=true - - --enableGlobalContext=true - --maxAPICallResponseLength=2000000 - --loggingFormat=text - --v=2 @@ -52803,7 +52801,6 @@ spec: - --metricsPort=8000 - --enableDeferredLoading=true - --dumpPayload=false - - --enableGlobalContext=true - --maxAPICallResponseLength=2000000 - --loggingFormat=text - --v=2 @@ -52945,7 +52942,6 @@ spec: - --skipResourceFilters=true - --enableConfigMapCaching=true - --enableDeferredLoading=true - - --enableGlobalContext=true - --maxAPICallResponseLength=2000000 - --loggingFormat=text - --v=2