From 2bc331ed826e5ff23161198fe5d5036bdafa48fe Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Mon, 24 Feb 2025 23:24:29 -0800 Subject: [PATCH] Config: Remove notes about future defaults. (#12898) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Clément Nussbaumer Co-authored-by: Clément Nussbaumer --- internal/ingress/controller/config/config.go | 2 -- internal/ingress/defaults/main.go | 1 - 2 files changed, 3 deletions(-) diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go index a0275697f..3864a176a 100644 --- a/internal/ingress/controller/config/config.go +++ b/internal/ingress/controller/config/config.go @@ -97,12 +97,10 @@ type Configuration struct { // AllowCrossNamespaceResources enables users to consume cross namespace resource on annotations // Case disabled, attempts to use secrets or configmaps from a namespace different from Ingress will // be denied - // This value will default to `false` on future releases AllowCrossNamespaceResources bool `json:"allow-cross-namespace-resources"` // AnnotationsRiskLevel represents the risk accepted on an annotation. If the risk is, for instance `Medium`, annotations // with risk High and Critical will not be accepted. - // Default Risk is Critical by default, but this may be changed in future releases AnnotationsRiskLevel string `json:"annotations-risk-level"` // AnnotationValueWordBlocklist defines words that should not be part of an user annotation value diff --git a/internal/ingress/defaults/main.go b/internal/ingress/defaults/main.go index cfad388ef..e892bf572 100644 --- a/internal/ingress/defaults/main.go +++ b/internal/ingress/defaults/main.go @@ -185,7 +185,6 @@ type SecurityConfiguration struct { // AllowCrossNamespaceResources enables users to consume cross namespace resource on annotations // Case disabled, attempts to use secrets or configmaps from a namespace different from Ingress will // be denied - // This valid will default to `false` on future releases AllowCrossNamespaceResources bool `json:"allow-cross-namespace-resources"` // AnnotationsRiskLevel represents the risk accepted on an annotation. If the risk is, for instance `Medium`, annotations