Skip to content

Commit

Permalink
Fixed issue with instances that don't run in $.project.shortName name…
Browse files Browse the repository at this point in the history
…space

Eventually, $.kubernetes.agent.namespace should be set to something different from $.kubernetes.master.namespace
to run build jobs in separate namespace (see #5), but for now let's stick to same as parent.

Signed-off-by: Mikaël Barbero <mikael.barbero@eclipse-foundation.org>
  • Loading branch information
mbarbero authored and fredg02 committed Jun 25, 2020
1 parent 029af8b commit 2603b99
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion templates/clouds.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
kubernetes(cloudName, config, agents): {
[cloudName]: {
kind: "kubernetes",
namespace: config.kubernetes.agents.namespace, # should be changed to something agent-specific to fix #5
namespace: config.kubernetes.agents.namespace,
podRetention: "never",
templates: {
[agentName]: agents[agentName].spec + agents[agentName].variants[config.jiroMaster.remoting.version] + {
Expand Down
2 changes: 1 addition & 1 deletion templates/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ local clouds = import "clouds.libsonnet";
}
},
agents: {
namespace: $.project.shortName,
namespace: $.kubernetes.master.namespace, # should be changed to something agent-specific to fix #5
defaultResources: {
local Const = import "k8s/resource-packs.libsonnet",
cpu: {
Expand Down

0 comments on commit 2603b99

Please sign in to comment.