Merge pull request #67349 from mikedanese/trbeta

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. promote TokenRequest and projection to beta in 1.12 ```release-note TokenRequest and TokenRequestProjection are now beta features. To enable these feature, the API server needs to be started with the following flags: * --service-account-issuer * --service-account-signing-key-file * --service-account-api-audiences ```

Merge pull request #67349 from mikedanese/trbeta
c081c024 · Kubernetes Submit Queue · GitHub · 07f68ea8 · 92b4e3ca · c081c024
Unverified Commit c081c024 authored Aug 30, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

kube_features.go pkg/features/kube_features.go +4 -4

cluster-roles.yaml ...thorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml +6 -0

No files found.
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -255,13 +255,13 @@ const (
 	ScheduleDaemonSetPods utilfeature.Feature = "ScheduleDaemonSetPods"
 	// owner: @mikedanese
-	// alpha: v1.10
+	// beta: v1.12
 	//
 	// Implement TokenRequest endpoint on service account resources.
 	TokenRequest utilfeature.Feature = "TokenRequest"
 	// owner: @mikedanese
-	// alpha: v1.11
+	// beta: v1.12
 	//
 	// Enable ServiceAccountTokenVolumeProjection support in ProjectedVolumes.
 	TokenRequestProjection utilfeature.Feature = "TokenRequestProjection"
@@ -408,8 +408,8 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
 	SupportPodPidsLimit:                         {Default: false, PreRelease: utilfeature.Alpha},
 	HyperVContainer:                             {Default: false, PreRelease: utilfeature.Alpha},
 	ScheduleDaemonSetPods:                       {Default: false, PreRelease: utilfeature.Alpha},
-	TokenRequest:                                {Default: false, PreRelease: utilfeature.Alpha},
+	TokenRequest:                                {Default: true, PreRelease: utilfeature.Beta},
-	TokenRequestProjection:                      {Default: false, PreRelease: utilfeature.Alpha},
+	TokenRequestProjection:                      {Default: true, PreRelease: utilfeature.Beta},
 	CRIContainerLogRotation:                     {Default: true, PreRelease: utilfeature.Beta},
 	GCERegionalPersistentDisk:                   {Default: true, PreRelease: utilfeature.Beta},
 	RunAsGroup:                                  {Default: false, PreRelease: utilfeature.Alpha},

--- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
+++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
@@ -951,6 +951,12 @@ items:
    - patch
    - update
  - apiGroups:
+    - ""
+    resources:
+    - serviceaccounts/token
+    verbs:
+    - create
+  - apiGroups:
    - storage.k8s.io
    resources:
    - volumeattachments