Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3787fc5e
Commit
3787fc5e
authored
Apr 16, 2015
by
Jeff Lowdermilk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set KUBECONFIG in common.sh, default to new location
and preserve value in ginkgo e2e test driver
parent
08f17bfa
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
4 additions
and
28 deletions
+4
-28
util.sh
cluster/aws/util.sh
+0
-1
util.sh
cluster/azure/util.sh
+0
-1
util.sh
cluster/libvirt-coreos/util.sh
+0
-1
util.sh
cluster/rackspace/util.sh
+0
-1
util.sh
cluster/vagrant/util.sh
+0
-1
util.sh
cluster/vsphere/util.sh
+0
-1
ginkgo-e2e.sh
hack/ginkgo-e2e.sh
+4
-22
No files found.
cluster/aws/util.sh
View file @
3787fc5e
...
...
@@ -605,7 +605,6 @@ function kube-up {
echo
"Kubernetes cluster created."
# TODO use token instead of kube_auth
export
KUBECONFIG
=
"
${
KUBECONFIG
:-${
HOME
}
/.kube/.kubeconfig
}
"
export
KUBE_CERT
=
"/tmp/
$RANDOM
-kubecfg.crt"
export
KUBE_KEY
=
"/tmp/
$RANDOM
-kubecfg.key"
export
CA_CERT
=
"/tmp/
$RANDOM
-kubernetes.ca.crt"
...
...
cluster/azure/util.sh
View file @
3787fc5e
...
...
@@ -420,7 +420,6 @@ function kube-up {
printf
"
\n
"
echo
"Kubernetes cluster created."
export
KUBECONFIG
=
"
${
KUBECONFIG
:-${
HOME
}
/.kube/.kubeconfig
}
"
export
KUBE_CERT
=
"/tmp/
$RANDOM
-kubecfg.crt"
export
KUBE_KEY
=
"/tmp/
$RANDOM
-kubecfg.key"
export
CA_CERT
=
"/tmp/
$RANDOM
-kubernetes.ca.crt"
...
...
cluster/libvirt-coreos/util.sh
View file @
3787fc5e
...
...
@@ -237,7 +237,6 @@ function kube-up {
rm
$domain_xml
done
export
KUBECONFIG
=
"
${
KUBECONFIG
:-${
HOME
}
/.kube/.kubeconfig
}
"
export
KUBE_SERVER
=
"http://192.168.10.1:8080"
export
CONTEXT
=
"libvirt-coreos"
create-kubeconfig
...
...
cluster/rackspace/util.sh
View file @
3787fc5e
...
...
@@ -318,7 +318,6 @@ kube-up() {
echo
"Kubernetes cluster created."
export
KUBECONFIG
=
"
${
KUBECONFIG
-
${
HOME
}
/.kube/.kubeconfig
}
"
export
KUBE_CERT
=
""
export
KUBE_KEY
=
""
export
CA_CERT
=
""
...
...
cluster/vagrant/util.sh
View file @
3787fc5e
...
...
@@ -253,7 +253,6 @@ function kube-up {
vagrant up
export
KUBECONFIG
=
"
${
KUBECONFIG
:-${
HOME
}
/.kube/.kubeconfig
}
"
export
KUBE_CERT
=
"/tmp/
$RANDOM
-kubecfg.crt"
export
KUBE_KEY
=
"/tmp/
$RANDOM
-kubecfg.key"
export
CA_CERT
=
"/tmp/
$RANDOM
-kubernetes.ca.crt"
...
...
cluster/vsphere/util.sh
View file @
3787fc5e
...
...
@@ -364,7 +364,6 @@ function kube-up {
echo
"Kubernetes cluster created."
# TODO use token instead of basic auth
export
KUBECONFIG
=
"
${
KUBECONFIG
:-
"
${
HOME
}
/.kube/.kubeconfig"
}
"
export
KUBE_CERT
=
"/tmp/
$RANDOM
-kubecfg.crt"
export
KUBE_KEY
=
"/tmp/
$RANDOM
-kubecfg.key"
export
CA_CERT
=
"/tmp/
$RANDOM
-kubernetes.ca.crt"
...
...
hack/ginkgo-e2e.sh
View file @
3787fc5e
...
...
@@ -87,15 +87,7 @@ if [[ -z "${AUTH_CONFIG:-}" ]]; then
detect-master
>
/dev/null
if
[[
"
$KUBERNETES_PROVIDER
"
==
"vagrant"
]]
;
then
# When we are using vagrant it has hard coded auth. We repeat that here so that
# we don't clobber auth that might be used for a publicly facing cluster.
auth_config
=(
"--auth_config=
${
HOME
}
/.kubernetes_vagrant_auth"
"--kubeconfig=
${
HOME
}
/.kubernetes_vagrant_kubeconfig"
)
elif
[[
"
${
KUBERNETES_PROVIDER
}
"
==
"gke"
]]
;
then
if
[[
"
${
KUBERNETES_PROVIDER
}
"
==
"gke"
]]
;
then
# GKE stores its own kubeconfig in gcloud's config directory.
detect-project &> /dev/null
auth_config
=(
...
...
@@ -103,25 +95,15 @@ if [[ -z "${AUTH_CONFIG:-}" ]]; then
# gcloud doesn't set the current-context, so we have to set it
"--context=gke_
${
PROJECT
}
_
${
ZONE
}
_
${
CLUSTER_NAME
}
"
)
elif
[[
"
${
KUBERNETES_PROVIDER
}
"
==
"gce"
]]
;
then
auth_config
=(
"--kubeconfig=
${
KUBECONFIG
:-
$DEFAULT_KUBECONFIG
}
"
)
elif
[[
"
${
KUBERNETES_PROVIDER
}
"
==
"aws"
]]
;
then
auth_config
=(
"--auth_config=
${
HOME
}
/.kube/
${
INSTANCE_PREFIX
}
/kubernetes_auth"
)
elif
[[
"
${
KUBERNETES_PROVIDER
}
"
==
"libvirt-coreos"
]]
;
then
auth_config
=(
"--kubeconfig=
${
HOME
}
/.kube/.kubeconfig"
)
elif
[[
"
${
KUBERNETES_PROVIDER
}
"
==
"conformance_test"
]]
;
then
auth_config
=(
"--auth_config=
${
KUBERNETES_CONFORMANCE_TEST_AUTH_CONFIG
:-}
"
"--cert_dir=
${
KUBERNETES_CONFORMANCE_TEST_CERT_DIR
:-}
"
)
else
auth_config
=()
auth_config
=(
"--kubeconfig=
${
KUBECONFIG
:-
$DEFAULT_KUBECONFIG
}
"
)
fi
else
echo
"Conformance Test. No cloud-provider-specific preparation."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment