-
Notifications
You must be signed in to change notification settings - Fork 38.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
apiserver: make not-found external-apiserver-authn configmap non-fatal #67836
Merged
k8s-github-robot
merged 1 commit into
kubernetes:master
from
sttts:sttts-non-fatal-missing-external-apiserver-authn-configmap
Aug 30, 2018
+26
−13
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,6 +26,7 @@ import ( | |
"github.com/spf13/pflag" | ||
|
||
"k8s.io/api/core/v1" | ||
"k8s.io/apimachinery/pkg/api/errors" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
"k8s.io/apiserver/pkg/authentication/authenticatorfactory" | ||
"k8s.io/apiserver/pkg/server" | ||
|
@@ -238,34 +239,45 @@ func (s *DelegatingAuthenticationOptions) lookupMissingConfigInCluster(client ku | |
} | ||
|
||
authConfigMap, err := client.CoreV1().ConfigMaps(authenticationConfigMapNamespace).Get(authenticationConfigMapName, metav1.GetOptions{}) | ||
if err != nil { | ||
switch { | ||
case errors.IsNotFound(err): | ||
// ignore, authConfigMap is nil now | ||
case errors.IsForbidden(err): | ||
glog.Warningf("Unable to get configmap/%s in %s. Usually fixed by "+ | ||
"'kubectl create rolebinding -n %s ROLE_NAME --role=%s --serviceaccount=YOUR_NS:YOUR_SA'", | ||
authenticationConfigMapName, authenticationConfigMapNamespace, authenticationConfigMapNamespace, authenticationRoleName) | ||
return err | ||
case err != nil: | ||
return err | ||
} | ||
|
||
if len(s.ClientCert.ClientCA) == 0 { | ||
opt, err := inClusterClientCA(authConfigMap) | ||
if err != nil { | ||
return err | ||
if authConfigMap != nil { | ||
opt, err := inClusterClientCA(authConfigMap) | ||
if err != nil { | ||
return err | ||
} | ||
if opt != nil { | ||
s.ClientCert = *opt | ||
} | ||
} | ||
if opt == nil { | ||
if len(s.ClientCert.ClientCA) == 0 { | ||
glog.Warningf("Cluster doesn't provide client-ca-file in configmap/%s in %s, so client certificate authentication to extension api-server won't work.", authenticationConfigMapName, authenticationConfigMapNamespace) | ||
} else { | ||
s.ClientCert = *opt | ||
} | ||
} | ||
|
||
if len(s.RequestHeader.ClientCAFile) == 0 { | ||
opt, err := inClusterRequestHeader(authConfigMap) | ||
if err != nil { | ||
return err | ||
if authConfigMap != nil { | ||
opt, err := inClusterRequestHeader(authConfigMap) | ||
if err != nil { | ||
return err | ||
} | ||
if opt != nil { | ||
s.RequestHeader = *opt | ||
} | ||
} | ||
if opt == nil { | ||
if len(s.RequestHeader.ClientCAFile) == 0 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto?🤔 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto :) |
||
glog.Warningf("Cluster doesn't provide requestheader-client-ca-file in configmap/%s in %s, so request-header client certificate authentication to extension api-server won't work.", authenticationConfigMapName, authenticationConfigMapNamespace) | ||
} else { | ||
s.RequestHeader = *opt | ||
} | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what about moving this into block L257-259?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would hide the warning if the configmap is not found.