Skip to content

K
k3s
Unverified Commit 213a1828 authored by Andy Goldstein's avatar Andy Goldstein
Browse files
Options

Fix test failure when executed using build/run.sh

The container used by build/run.sh doesn't necessarily have an entry in /etc/passwd for the host user's uid, and this missing data causes `whoami` to fail. Switch `whoami` to `id -un` to fall back to the uid if the /etc/passwd entry is missing. Signed-off-by: 's avatarAndy Goldstein <andy.goldstein@gmail.com>
parent aff6daec
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/gce/gci/apiserver_manifest_test.go
View file @ 213a1828
...@@ -51,7 +51,7 @@ readonly DOCKER_REGISTRY="k8s.gcr.io" ...@@ -51,7 +51,7 @@ readonly DOCKER_REGISTRY="k8s.gcr.io"
readonly ENABLE_LEGACY_ABAC=false readonly ENABLE_LEGACY_ABAC=false
readonly ETC_MANIFESTS=${KUBE_HOME}/etc/kubernetes/manifests readonly ETC_MANIFESTS=${KUBE_HOME}/etc/kubernetes/manifests
readonly KUBE_API_SERVER_DOCKER_TAG=v1.11.0-alpha.0.1808_3c7452dc11645d-dirty readonly KUBE_API_SERVER_DOCKER_TAG=v1.11.0-alpha.0.1808_3c7452dc11645d-dirty
readonly LOG_OWNER_USER=$(whoami) readonly LOG_OWNER_USER=$(id -un)
readonly LOG_OWNER_GROUP=$(id -gn) readonly LOG_OWNER_GROUP=$(id -gn)
ENCRYPTION_PROVIDER_CONFIG={{.EncryptionProviderConfig}} ENCRYPTION_PROVIDER_CONFIG={{.EncryptionProviderConfig}}
ENCRYPTION_PROVIDER_CONFIG_PATH={{.EncryptionProviderConfigPath}} ENCRYPTION_PROVIDER_CONFIG_PATH={{.EncryptionProviderConfigPath}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment