diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/rbac.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/rbac.yaml index ef1c57c8305..f254e6648cc 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/rbac.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/rbac.yaml @@ -8,4 +8,7 @@ rules: verbs: ["get", "watch", "list"] - apiGroups: ["admissionregistration.k8s.io"] resources: ["mutatingwebhookconfigurations", "validatingwebhookconfigurations"] - verbs: ["get", "watch", "list"] \ No newline at end of file + verbs: ["get", "watch", "list"] +- apiGroups: ["flowcontrol.apiserver.k8s.io"] + resources: ['prioritylevelconfigurations', 'flowschemas'] + verbs: ['list', 'watch'] \ No newline at end of file diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 529c3353228..02c5f9e31c2 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -164,6 +164,7 @@ func SetUpSampleAPIServer(ctx context.Context, f *framework.Framework, aggrclien Rules: []rbacv1.PolicyRule{ rbacv1helpers.NewRule("get", "list", "watch").Groups("").Resources("namespaces").RuleOrDie(), rbacv1helpers.NewRule("get", "list", "watch").Groups("admissionregistration.k8s.io").Resources("*").RuleOrDie(), + rbacv1helpers.NewRule("get", "list", "watch").Groups("flowcontrol.apiserver.k8s.io").Resources("prioritylevelconfigurations", "flowschemas").RuleOrDie(), }, }, metav1.CreateOptions{}) framework.ExpectNoError(err, "creating cluster role %s", n.clusterRole) @@ -412,7 +413,7 @@ func SetUpSampleAPIServer(ctx context.Context, f *framework.Framework, aggrclien framework.ExpectNoError(err, "gave up waiting for apiservice wardle to come up successfully") } -// TestSampleAPIServer is a basic test if the sample-apiserver code from 1.10 and compiled against 1.10 +// TestSampleAPIServer is a basic test if the sample-apiserver code from 1.27 and compiled against 1.27 // will work on the current Aggregator/API-Server. func TestSampleAPIServer(ctx context.Context, f *framework.Framework, aggrclient *aggregatorclient.Clientset, image, apiServiceGroupName, apiServiceVersion string) { n := generateSampleAPIServerObjectNames(f.Namespace.Name) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 39d3d48704b..81ed84f11c8 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -232,7 +232,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[AgnhostPrivate] = Config{list.PrivateRegistry, "agnhost", "2.6"} configs[AuthenticatedAlpine] = Config{list.GcAuthenticatedRegistry, "alpine", "3.7"} configs[AuthenticatedWindowsNanoServer] = Config{list.GcAuthenticatedRegistry, "windows-nanoserver", "v1"} - configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.17.7"} + configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.27.1"} configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"} configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}