Merge pull request #128168 from liggitt/4601-beta

KEP-4601: AuthorizeNodeWithSelectors / AuthorizeWithSelectors to beta

Kubernetes-commit: d7bd7284035e7debd5406d375cd366b164cf358f
This commit is contained in:
Kubernetes Publisher 2024-10-18 17:39:03 +01:00
commit ec228a4021
3 changed files with 3 additions and 6 deletions

View File

@ -873,9 +873,7 @@ func TestFilter(t *testing.T) {
for _, tc := range cases { for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
environment.DisableBaseEnvSetCachingForTests() environment.DisableBaseEnvSetCachingForTests()
if tc.enableSelectors { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.AuthorizeWithSelectors, tc.enableSelectors)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.AuthorizeWithSelectors, true)
}
if tc.testPerCallLimit == 0 { if tc.testPerCallLimit == 0 {
tc.testPerCallLimit = celconfig.PerCallLimit tc.testPerCallLimit = celconfig.PerCallLimit

View File

@ -291,6 +291,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
AuthorizeWithSelectors: { AuthorizeWithSelectors: {
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
}, },
ConcurrentWatchObjectDecode: { ConcurrentWatchObjectDecode: {

View File

@ -322,9 +322,7 @@ func Test_resourceAttributesFrom(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
if tt.enableAuthorizationSelector { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.AuthorizeWithSelectors, tt.enableAuthorizationSelector)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.AuthorizeWithSelectors, true)
}
if got := resourceAttributesFrom(tt.args.attr); !reflect.DeepEqual(got, tt.want) { if got := resourceAttributesFrom(tt.args.attr); !reflect.DeepEqual(got, tt.want) {
t.Errorf("resourceAttributesFrom() = %v, want %v", got, tt.want) t.Errorf("resourceAttributesFrom() = %v, want %v", got, tt.want)