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
034f06d7
Unverified
Commit
034f06d7
authored
Jun 05, 2017
by
Clayton Coleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Initializers from federation
parent
7bbc615b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
common.sh
federation/cluster/common.sh
+1
-1
init.go
federation/pkg/kubefed/init/init.go
+1
-1
init_test.go
federation/pkg/kubefed/init/init_test.go
+1
-1
test-federation-cmd.sh
hack/make-rules/test-federation-cmd.sh
+1
-1
No files found.
federation/cluster/common.sh
View file @
034f06d7
...
@@ -258,7 +258,7 @@ function create-federation-api-objects {
...
@@ -258,7 +258,7 @@ function create-federation-api-objects {
export
FEDERATION_APISERVER_KEY_BASE64
=
"
${
FEDERATION_APISERVER_KEY_BASE64
}
"
export
FEDERATION_APISERVER_KEY_BASE64
=
"
${
FEDERATION_APISERVER_KEY_BASE64
}
"
# Enable the NamespaceLifecycle admission control by default.
# Enable the NamespaceLifecycle admission control by default.
export
FEDERATION_ADMISSION_CONTROL
=
"
${
FEDERATION_ADMISSION_CONTROL
:-
Initializers
,
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
}
"
echo
"Creating manifest:
${
file
}
"
...
...
federation/pkg/kubefed/init/init.go
View file @
034f06d7
...
@@ -692,7 +692,7 @@ func createAPIServer(clientset client.Interface, namespace, name, federationName
...
@@ -692,7 +692,7 @@ func createAPIServer(clientset client.Interface, namespace, name, federationName
"--client-ca-file"
:
"/etc/federation/apiserver/ca.crt"
,
"--client-ca-file"
:
"/etc/federation/apiserver/ca.crt"
,
"--tls-cert-file"
:
"/etc/federation/apiserver/server.crt"
,
"--tls-cert-file"
:
"/etc/federation/apiserver/server.crt"
,
"--tls-private-key-file"
:
"/etc/federation/apiserver/server.key"
,
"--tls-private-key-file"
:
"/etc/federation/apiserver/server.key"
,
"--admission-control"
:
"
Initializers,
NamespaceLifecycle"
,
"--admission-control"
:
"NamespaceLifecycle"
,
}
}
if
advertiseAddress
!=
""
{
if
advertiseAddress
!=
""
{
...
...
federation/pkg/kubefed/init/init_test.go
View file @
034f06d7
...
@@ -869,7 +869,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na
...
@@ -869,7 +869,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na
fmt
.
Sprintf
(
"--secure-port=%d"
,
apiServerSecurePort
),
fmt
.
Sprintf
(
"--secure-port=%d"
,
apiServerSecurePort
),
"--tls-cert-file=/etc/federation/apiserver/server.crt"
,
"--tls-cert-file=/etc/federation/apiserver/server.crt"
,
"--tls-private-key-file=/etc/federation/apiserver/server.key"
,
"--tls-private-key-file=/etc/federation/apiserver/server.key"
,
"--admission-control=
Initializers,
NamespaceLifecycle"
,
"--admission-control=NamespaceLifecycle"
,
fmt
.
Sprintf
(
"--advertise-address=%s"
,
address
),
fmt
.
Sprintf
(
"--advertise-address=%s"
,
address
),
}
}
...
...
hack/make-rules/test-federation-cmd.sh
View file @
034f06d7
...
@@ -34,7 +34,7 @@ function run_federation_apiserver() {
...
@@ -34,7 +34,7 @@ function run_federation_apiserver() {
kube::log::status
"Starting federation-apiserver"
kube::log::status
"Starting federation-apiserver"
# Admission Controllers to invoke prior to persisting objects in cluster
# Admission Controllers to invoke prior to persisting objects in cluster
ADMISSION_CONTROL
=
"
Initializers,
NamespaceLifecycle"
ADMISSION_CONTROL
=
"NamespaceLifecycle"
"
${
KUBE_OUTPUT_HOSTBIN
}
/federation-apiserver"
\
"
${
KUBE_OUTPUT_HOSTBIN
}
/federation-apiserver"
\
--insecure-port
=
"
${
API_PORT
}
"
\
--insecure-port
=
"
${
API_PORT
}
"
\
...
...
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