Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Secrets in containerized nodes are wrong due to encoding #5778

Merged
merged 2 commits into from
Nov 7, 2015
Merged

Secrets in containerized nodes are wrong due to encoding #5778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e7209b
UPSTREAM: 16969: nsenter file writer mangles newlines
smarterclayton Nov 7, 2015
b2e0262
Make auth-in-container tests cause test failure again
smarterclayton Nov 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Godeps/_workspace/src/k8s.io/kubernetes/pkg/util/io/writer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions test/end-to-end/core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ oc project test
oc whoami

echo "[INFO] Running a CLI command in a container using the service account"
echo "[INFO] WARNING: Tests are set to not fail, dockererized container is writing an invalid ca.crt"
set +e
oc policy add-role-to-user view -z default
out=$(oc run cli-with-token --attach --env=POD_NAMESPACE=test --image=openshift/origin:${TAG} --restart=Never -- cli status --loglevel=4 2>&1)
echo $out
Expand All @@ -154,7 +152,6 @@ out=$(oc run kubectl-with-token --attach --env=POD_NAMESPACE=test --image=opensh
echo $out
[ "$(echo $out | grep 'Using in-cluster configuration')" ]
[ "$(echo $out | grep 'kubectl-with-token')" ]
set -e

echo "[INFO] Streaming the logs from a deployment twice..."
oc create -f test/fixtures/failing-dc.yaml
Expand Down