Skip to content

Fixes #4711 - add a namespace configuration option to KCF #4712

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

Merged
chetanmeh merged 5 commits into from
Nov 6, 2019
Merged

Fixes #4711 - add a namespace configuration option to KCF #4712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
366e7e5
Fixes #4711 - add a namespace configuration option to k8s container f…
mcdan Nov 4, 2019
3811836
Fixes #4711 - add comment to conf file for k8s namespace setting
mcdan Nov 4, 2019
abc9e40
Fixes #4711 - add description of the default behavior of the KCF name…
mcdan Nov 4, 2019
6b91bf2
ScalaFmt fixes
mcdan Nov 4, 2019
edf4a94
#4711 - make getting the builder be more idiomatic
mcdan Nov 5, 2019
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
7 changes: 6 additions & 1 deletion core/invoker/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ whisk {
key: "openwhisk-role"
value: "invoker"
}

# Enables forwarding to remote port via a local random port. This mode is mostly useful
# for development via Standalone mode
port-forwarding-enabled = false
Expand All @@ -87,6 +86,12 @@ whisk {
# 2. OR yaml formatted multi line string. See multi line config support https://github.com/lightbend/config/blob/master/HOCON.md#multi-line-strings
#
#pod-template =

# Set this optional string to be the namespace that the invoker should target for adding pods. This allows the invoker to run in a namesapce it doesn't have API access to but add pods to another namespace. See also https://github.com/apache/openwhisk/issues/4711
# When not set the underlying client may pickup the namesapce from the kubeconfig or via system property setting.
# See https://github.com/fabric8io/kubernetes-client#configuring-the-client for more information.
# action-namespace = "ns-actions"

}

# Timeouts for runc commands. Set to "Inf" to disable timeout.
Expand Down
9 changes: 6 additions & 3 deletions .../src/main/scala/org/apache/openwhisk/core/containerpool/kubernetes/KubernetesClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ case class KubernetesClientConfig(timeouts: KubernetesClientTimeoutConfig,
invokerAgent: KubernetesInvokerAgentConfig,
userPodNodeAffinity: KubernetesInvokerNodeAffinity,
portForwardingEnabled: Boolean,
actionNamespace: Option[String] = None,
podTemplate: Option[ConfigMapValue] = None)

/**
Expand All @@ -93,11 +94,13 @@ class KubernetesClient(
with ProcessRunner {
implicit protected val ec = executionContext
implicit protected val am = ActorMaterializer()
implicit protected val kubeRestClient = new DefaultKubernetesClient(
new ConfigBuilder()
implicit protected val kubeRestClient = {
val configBuilder = new ConfigBuilder()
.withConnectionTimeout(config.timeouts.logs.toMillis.toInt)
.withRequestTimeout(config.timeouts.logs.toMillis.toInt)
.build())
config.actionNamespace.foreach(configBuilder.withNamespace)
new DefaultKubernetesClient(configBuilder.build())
}

private val podBuilder = new WhiskPodBuilder(kubeRestClient, config.userPodNodeAffinity, config.podTemplate)

Expand Down