Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ blobs
.bzr
diego.sublime-workspace
diego-certs/
.vscode/

# go tooling
src/code.google.com/p/go.tools/
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -398,3 +398,12 @@
[submodule "src/code.cloudfoundry.org/csiplugin"]
path = src/code.cloudfoundry.org/csiplugin
url = https://github.com/cloudfoundry/csiplugin
[submodule "src/github.com/virtualcloudfoundry/goaci"]
path = src/github.com/virtualcloudfoundry/goaci
url = https://github.com/virtualcloudfoundry/goaci
[submodule "src/github.com/dimchansky/utfbom"]
path = src/github.com/dimchansky/utfbom
url = https://github.com/dimchansky/utfbom
[submodule "src/github.com/Azure/go-autorest"]
path = src/github.com/Azure/go-autorest
url = https://github.com/Azure/go-autorest
13 changes: 13 additions & 0 deletions jobs/rep/spec
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,19 @@ properties:
description: "Array of optional tags used for scheduling Tasks and LRPs"
default: []

diego.executor.container_service_provider:
description: "Indicates whether this diego cell uses the azure container instances, 'garden', 'aci' or 'eci'"
default: "garden"
diego.executor.azure_container_provider_cfg.id:
description: "service principal id for managing azure container instances"
default: null
diego.executor.azure_container_provider_cfg.secret:
description: "service principal secret for managing azure container instances"
default: null
diego.executor.azure_container_provider_cfg.optional_param_1:
description: "tenant of service principal for managing azure container instances"
default: null

loggregator.use_v2_api:
description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
default: false
Expand Down
5 changes: 5 additions & 0 deletions jobs/rep/templates/rep.json.erb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
temp_dir: "#{tmp_dir}",
unhealthy_monitoring_interval: "#{p("diego.executor.unhealthy_monitoring_interval_in_seconds")}s",
zone: "#{zone}",
container_service_provider: p("diego.executor.container_service_provider"),
}

if p("containers.graceful_shutdown_interval_in_seconds") < 10
Expand Down Expand Up @@ -190,5 +191,9 @@
config[:loggregator][:loggregator_job_origin] = "rep"
end

if config[:container_service_provider] == "aci"
config[:azure_container_provider_cfg] = p("diego.executor.azure_container_provider_cfg")
end

config.to_json
%>
13 changes: 13 additions & 0 deletions jobs/rep_windows/spec
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,19 @@ properties:
description: "Array of optional tags used for scheduling Tasks and LRPs"
default: []

diego.executor.container_service_provider:
description: "Indicates whether this diego cell uses the azure container instances, 'garden', 'aci' or 'eci'"
default: "garden"
diego.executor.azure_container_provider_cfg.id:
description: "service principal id for managing azure container instances"
default: null
diego.executor.azure_container_provider_cfg.secret:
description: "service principal secret for managing azure container instances"
default: null
diego.executor.azure_container_provider_cfg.optional_param_1:
description: "tenant of service principal for managing azure container instances"
default: null

syslog_daemon_config.address:
description: "Syslog host"
default: ""
Expand Down
5 changes: 5 additions & 0 deletions jobs/rep_windows/templates/rep.json.erb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
temp_dir: "#{tmp_dir}",
unhealthy_monitoring_interval: "#{p("diego.executor.unhealthy_monitoring_interval_in_seconds")}s",
zone: "#{zone}",
container_service_provider: p("diego.executor.container_service_provider"),
}

if p("containers.graceful_shutdown_interval_in_seconds") < 10
Expand Down Expand Up @@ -190,5 +191,9 @@
config[:loggregator][:loggregator_job_origin] = "rep"
end

if config[:container_service_provider] == "aci"
config[:azure_container_provider_cfg] = p("diego.executor.azure_container_provider_cfg")
end

config.to_json
%>
5 changes: 5 additions & 0 deletions packages/rep/spec
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ files:
- code.cloudfoundry.org/executor/depot/steps/*.go # gosub
- code.cloudfoundry.org/executor/depot/transformer/*.go # gosub
- code.cloudfoundry.org/executor/depot/uploader/*.go # gosub
- code.cloudfoundry.org/executor/depot/vci/aci/*.go # gosub
- code.cloudfoundry.org/executor/depot/vci/vgarden/*.go # gosub
- code.cloudfoundry.org/executor/gardenhealth/*.go # gosub
- code.cloudfoundry.org/executor/guidgen/*.go # gosub
- code.cloudfoundry.org/executor/initializer/*.go # gosub
Expand Down Expand Up @@ -84,6 +86,7 @@ files:
- code.cloudfoundry.org/volman/voldiscoverers/*.go # gosub
- code.cloudfoundry.org/volman/vollocal/*.go # gosub
- code.cloudfoundry.org/workpool/*.go # gosub
- github.com/Azure/go-autorest/autorest/azure/*.go # gosub
- github.com/bmizerany/pat/*.go # gosub
- github.com/cloudfoundry/dropsonde/*.go # gosub
- github.com/cloudfoundry/dropsonde/emitter/*.go # gosub
Expand Down Expand Up @@ -118,6 +121,8 @@ files:
- github.com/tedsuo/ifrit/http_server/*.go # gosub
- github.com/tedsuo/ifrit/sigmon/*.go # gosub
- github.com/tedsuo/rata/*.go # gosub
- github.com/virtualcloudfoundry/goaci/*.go # gosub
- github.com/virtualcloudfoundry/goaci/aci/*.go # gosub
- github.com/vito/go-sse/sse/*.go # gosub
- golang.org/x/net/context/*.go # gosub
- golang.org/x/net/http2/*.go # gosub
Expand Down
5 changes: 5 additions & 0 deletions packages/rep_windows/spec
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ files:
- code.cloudfoundry.org/executor/depot/steps/*.go # gosub
- code.cloudfoundry.org/executor/depot/transformer/*.go # gosub
- code.cloudfoundry.org/executor/depot/uploader/*.go # gosub
- code.cloudfoundry.org/executor/depot/vci/aci/*.go # gosub
- code.cloudfoundry.org/executor/depot/vci/vgarden/*.go # gosub
- code.cloudfoundry.org/executor/gardenhealth/*.go # gosub
- code.cloudfoundry.org/executor/guidgen/*.go # gosub
- code.cloudfoundry.org/executor/initializer/*.go # gosub
Expand Down Expand Up @@ -85,6 +87,7 @@ files:
- code.cloudfoundry.org/volman/voldiscoverers/*.go # gosub
- code.cloudfoundry.org/volman/vollocal/*.go # gosub
- code.cloudfoundry.org/workpool/*.go # gosub
- github.com/Azure/go-autorest/autorest/azure/*.go # gosub
- github.com/bmizerany/pat/*.go # gosub
- github.com/cloudfoundry/dropsonde/*.go # gosub
- github.com/cloudfoundry/dropsonde/emitter/*.go # gosub
Expand Down Expand Up @@ -119,6 +122,8 @@ files:
- github.com/tedsuo/ifrit/http_server/*.go # gosub
- github.com/tedsuo/ifrit/sigmon/*.go # gosub
- github.com/tedsuo/rata/*.go # gosub
- github.com/virtualcloudfoundry/goaci/*.go # gosub
- github.com/virtualcloudfoundry/goaci/aci/*.go # gosub
- github.com/vito/go-sse/sse/*.go # gosub
- golang.org/x/net/context/*.go # gosub
- golang.org/x/net/http2/*.go # gosub
Expand Down
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/diego-ssh
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/uaa-go-client
Submodule uaa-go-client updated 1 files
+2 −2 client.go