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
48f79cf6
Commit
48f79cf6
authored
Jan 06, 2017
by
Madhusudan.C.S
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Quote a bash variable, fix a typo and add some additional logging.
parent
0c81f60b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
common.sh
federation/cluster/common.sh
+4
-2
framework.go
test/e2e/framework/framework.go
+0
-1
No files found.
federation/cluster/common.sh
View file @
48f79cf6
...
@@ -160,7 +160,7 @@ function create-federation-api-objects {
...
@@ -160,7 +160,7 @@ function create-federation-api-objects {
gen-kube-basicauth
gen-kube-basicauth
export
FEDERATION_API_BASIC_AUTH
=
"
${
KUBE_PASSWORD
}
,
${
KUBE_USER
}
,admin"
export
FEDERATION_API_BASIC_AUTH
=
"
${
KUBE_PASSWORD
}
,
${
KUBE_USER
}
,admin"
# Create a kubeconfig with credent
ai
ls for federation-apiserver. We will
# Create a kubeconfig with credent
ia
ls for federation-apiserver. We will
# then use this kubeconfig to create a secret which the federation
# then use this kubeconfig to create a secret which the federation
# controller manager can use to talk to the federation-apiserver.
# controller manager can use to talk to the federation-apiserver.
# Note that the file name should be "kubeconfig" so that the secret key gets the same name.
# Note that the file name should be "kubeconfig" so that the secret key gets the same name.
...
@@ -203,12 +203,14 @@ function create-federation-api-objects {
...
@@ -203,12 +203,14 @@ function create-federation-api-objects {
export
FEDERATION_ADMISSION_CONTROL
=
"
${
FEDERATION_ADMISSION_CONTROL
:-
NamespaceLifecycle
}
"
export
FEDERATION_ADMISSION_CONTROL
=
"
${
FEDERATION_ADMISSION_CONTROL
:-
NamespaceLifecycle
}
"
for
file
in
federation-etcd-pvc.yaml federation-apiserver-
{
deployment,secrets
}
.yaml federation-controller-manager-deployment.yaml
;
do
for
file
in
federation-etcd-pvc.yaml federation-apiserver-
{
deployment,secrets
}
.yaml federation-controller-manager-deployment.yaml
;
do
echo
"Creating manifest:
${
file
}
"
$template
"
${
manifests_root
}
/
${
file
}
"
$template
"
${
manifests_root
}
/
${
file
}
"
|
$host_kubectl
create
-f
-
$template
"
${
manifests_root
}
/
${
file
}
"
|
$host_kubectl
create
-f
-
done
done
# Update the users kubeconfig to include federation-apiserver credentials.
# Update the users kubeconfig to include federation-apiserver credentials.
CONTEXT
=
${
FEDERATION_KUBE_CONTEXT
}
\
CONTEXT
=
${
FEDERATION_KUBE_CONTEXT
}
\
KUBE_BEARER_TOKEN
=
"
$
FEDERATION_API_TOKEN
"
\
KUBE_BEARER_TOKEN
=
"
$
{
FEDERATION_API_TOKEN
}
"
\
KUBE_USER
=
"
${
KUBE_USER
}
"
\
KUBE_USER
=
"
${
KUBE_USER
}
"
\
KUBE_PASSWORD
=
"
${
KUBE_PASSWORD
}
"
\
KUBE_PASSWORD
=
"
${
KUBE_PASSWORD
}
"
\
SECONDARY_KUBECONFIG
=
true
\
SECONDARY_KUBECONFIG
=
true
\
...
...
test/e2e/framework/framework.go
View file @
48f79cf6
...
@@ -751,7 +751,6 @@ func (f *Framework) GetUnderlyingFederatedContexts() []E2EContext {
...
@@ -751,7 +751,6 @@ func (f *Framework) GetUnderlyingFederatedContexts() []E2EContext {
e2eContexts
:=
[]
E2EContext
{}
e2eContexts
:=
[]
E2EContext
{}
for
_
,
context
:=
range
kubeconfig
.
Contexts
{
for
_
,
context
:=
range
kubeconfig
.
Contexts
{
if
strings
.
HasPrefix
(
context
.
Name
,
"federation"
)
&&
context
.
Name
!=
federatedKubeContext
{
if
strings
.
HasPrefix
(
context
.
Name
,
"federation"
)
&&
context
.
Name
!=
federatedKubeContext
{
user
:=
kubeconfig
.
findUser
(
context
.
Context
.
User
)
user
:=
kubeconfig
.
findUser
(
context
.
Context
.
User
)
if
user
==
nil
{
if
user
==
nil
{
Failf
(
"Could not find user for context %+v"
,
context
)
Failf
(
"Could not find user for context %+v"
,
context
)
...
...
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