Merge pull request #8798 from hakman/kubeconfig-users

Update default users for kubeconfig with supported distros
This commit is contained in:
Kubernetes Prow Robot 2020-03-25 12:18:25 -07:00 committed by GitHub
commit b129a83638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -106,8 +106,12 @@ func (b *KubectlBuilder) findKubeconfigUser() (*fi.User, *fi.Group, error) {
switch b.Distribution {
case distros.DistributionJessie, distros.DistributionDebian9, distros.DistributionDebian10:
users = []string{"admin", "root"}
case distros.DistributionCentos7:
case distros.DistributionXenial, distros.DistributionBionic, distros.DistributionFocal:
users = []string{"ubuntu"}
case distros.DistributionCentos7, distros.DistributionCentos8:
users = []string{"centos"}
case distros.DistributionAmazonLinux2, distros.DistributionRhel7, distros.DistributionRhel8:
users = []string{"ec2-user"}
default:
klog.Warningf("Unknown distro; won't write kubeconfig to homedir %s", b.Distribution)
return nil, nil, nil