Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62005 from mikedanese/svcacctproj
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. implement ServiceAccountTokenProjection design here: kubernetes/community#1973 part of #61858 ```release-note Add a volume projection that is able to project service account tokens. ``` part of #48408 @kubernetes/sig-auth-pr-reviews @kubernetes/sig-storage-pr-reviews
- Loading branch information
Showing
23 changed files
with
553 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") | ||
|
|
||
| filegroup( | ||
| name = "package-srcs", | ||
| srcs = glob(["**"]), | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "all-srcs", | ||
| srcs = [":package-srcs"], | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:public"], | ||
| ) | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = ["token_manager.go"], | ||
| importpath = "k8s.io/kubernetes/pkg/kubelet/token", | ||
| visibility = ["//visibility:public"], | ||
| deps = [ | ||
| "//vendor/github.com/golang/glog:go_default_library", | ||
| "//vendor/k8s.io/api/authentication/v1:go_default_library", | ||
| "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", | ||
| "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", | ||
| "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", | ||
| ], | ||
| ) | ||
|
|
||
| go_test( | ||
| name = "go_default_test", | ||
| srcs = ["token_manager_test.go"], | ||
| embed = [":go_default_library"], | ||
| deps = [ | ||
| "//vendor/k8s.io/api/authentication/v1:go_default_library", | ||
| "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", | ||
| "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library", | ||
| ], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| approvers: | ||
| - mikedanese | ||
| reviewers: | ||
| - mikedanese | ||
| - awly | ||
| - tallclair |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // Package token implements a manager of serviceaccount tokens for pods running | ||
| // on the node. | ||
| package token | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/golang/glog" | ||
| authenticationv1 "k8s.io/api/authentication/v1" | ||
| "k8s.io/apimachinery/pkg/util/clock" | ||
| "k8s.io/apimachinery/pkg/util/wait" | ||
| corev1 "k8s.io/client-go/kubernetes/typed/core/v1" | ||
| ) | ||
|
|
||
| const ( | ||
| maxTTL = 24 * time.Hour | ||
| gcPeriod = time.Minute | ||
| ) | ||
|
|
||
| // NewManager returns a new token manager. | ||
| func NewManager(c corev1.CoreV1Interface) *Manager { | ||
| m := &Manager{ | ||
| getToken: func(name, namespace string, tr *authenticationv1.TokenRequest) (*authenticationv1.TokenRequest, error) { | ||
| return c.ServiceAccounts(namespace).CreateToken(name, tr) | ||
| }, | ||
| cache: make(map[string]*authenticationv1.TokenRequest), | ||
| clock: clock.RealClock{}, | ||
| } | ||
| go wait.Forever(m.cleanup, gcPeriod) | ||
| return m | ||
| } | ||
|
|
||
| // Manager manages service account tokens for pods. | ||
| type Manager struct { | ||
|
|
||
| // cacheMutex guards the cache | ||
| cacheMutex sync.RWMutex | ||
| cache map[string]*authenticationv1.TokenRequest | ||
|
|
||
| // mocked for testing | ||
| getToken func(name, namespace string, tr *authenticationv1.TokenRequest) (*authenticationv1.TokenRequest, error) | ||
| clock clock.Clock | ||
| } | ||
|
|
||
| // GetServiceAccountToken gets a service account token for a pod from cache or | ||
| // from the TokenRequest API. This process is as follows: | ||
| // * Check the cache for the current token request. | ||
| // * If the token exists and does not require a refresh, return the current token. | ||
| // * Attempt to refresh the token. | ||
| // * If the token is refreshed successfully, save it in the cache and return the token. | ||
| // * If refresh fails and the old token is still valid, log an error and return the old token. | ||
| // * If refresh fails and the old token is no longer valid, return an error | ||
| func (m *Manager) GetServiceAccountToken(name, namespace string, tr *authenticationv1.TokenRequest) (*authenticationv1.TokenRequest, error) { | ||
| key := keyFunc(name, namespace, tr) | ||
| ctr, ok := m.get(key) | ||
|
|
||
| if ok && !m.requiresRefresh(ctr) { | ||
| return ctr, nil | ||
| } | ||
|
|
||
| tr, err := m.getToken(name, namespace, tr) | ||
| if err != nil { | ||
| switch { | ||
| case !ok: | ||
| return nil, fmt.Errorf("failed to fetch token: %v", err) | ||
| case m.expired(ctr): | ||
| return nil, fmt.Errorf("token %s expired and refresh failed: %v", key, err) | ||
| default: | ||
| glog.Errorf("couldn't update token %s: %v", key, err) | ||
| return ctr, nil | ||
| } | ||
| } | ||
|
|
||
| m.set(key, tr) | ||
| return tr, nil | ||
| } | ||
|
|
||
| func (m *Manager) cleanup() { | ||
| m.cacheMutex.Lock() | ||
| defer m.cacheMutex.Unlock() | ||
| for k, tr := range m.cache { | ||
| if m.expired(tr) { | ||
| delete(m.cache, k) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (m *Manager) get(key string) (*authenticationv1.TokenRequest, bool) { | ||
| m.cacheMutex.RLock() | ||
| defer m.cacheMutex.RUnlock() | ||
| ctr, ok := m.cache[key] | ||
| return ctr, ok | ||
| } | ||
|
|
||
| func (m *Manager) set(key string, tr *authenticationv1.TokenRequest) { | ||
| m.cacheMutex.Lock() | ||
| defer m.cacheMutex.Unlock() | ||
| m.cache[key] = tr | ||
| } | ||
|
|
||
| func (m *Manager) expired(t *authenticationv1.TokenRequest) bool { | ||
| return m.clock.Now().After(t.Status.ExpirationTimestamp.Time) | ||
| } | ||
|
|
||
| // requiresRefresh returns true if the token is older than 80% of its total | ||
| // ttl, or if the token is older than 24 hours. | ||
| func (m *Manager) requiresRefresh(tr *authenticationv1.TokenRequest) bool { | ||
| if tr.Spec.ExpirationSeconds == nil { | ||
| glog.Errorf("expiration seconds was nil for tr: %#v", tr) | ||
| return false | ||
| } | ||
| now := m.clock.Now() | ||
| exp := tr.Status.ExpirationTimestamp.Time | ||
| iat := exp.Add(-1 * time.Duration(*tr.Spec.ExpirationSeconds) * time.Second) | ||
|
|
||
| if now.After(iat.Add(maxTTL)) { | ||
| return true | ||
| } | ||
| // Require a refresh if within 20% of the TTL from the expiration time. | ||
| if now.After(exp.Add(-1 * time.Duration((*tr.Spec.ExpirationSeconds*20)/100) * time.Second)) { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| // keys should be nonconfidential and safe to log | ||
| func keyFunc(name, namespace string, tr *authenticationv1.TokenRequest) string { | ||
| return fmt.Sprintf("%q/%q/%#v", name, namespace, tr.Spec) | ||
| } |
Oops, something went wrong.