diff --git a/.gitignore b/.gitignore index ce8d4b5fcf..79a083b658 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ blobs .bzr diego.sublime-workspace diego-certs/ +.vscode/ # go tooling src/code.google.com/p/go.tools/ diff --git a/.gitmodules b/.gitmodules index cee4448e3f..1608bab4a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/jobs/rep/spec b/jobs/rep/spec index 61631504f0..bb0b570807 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -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 diff --git a/jobs/rep/templates/rep.json.erb b/jobs/rep/templates/rep.json.erb index ebedd83ea1..299bfb0aa4 100644 --- a/jobs/rep/templates/rep.json.erb +++ b/jobs/rep/templates/rep.json.erb @@ -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 @@ -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 %> diff --git a/jobs/rep_windows/spec b/jobs/rep_windows/spec index caaef5e7d6..729639225c 100644 --- a/jobs/rep_windows/spec +++ b/jobs/rep_windows/spec @@ -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: "" diff --git a/jobs/rep_windows/templates/rep.json.erb b/jobs/rep_windows/templates/rep.json.erb index 1470016ebe..3e664fed3e 100644 --- a/jobs/rep_windows/templates/rep.json.erb +++ b/jobs/rep_windows/templates/rep.json.erb @@ -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 @@ -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 %> diff --git a/packages/rep/spec b/packages/rep/spec index bfe2922b47..da52cafb1a 100644 --- a/packages/rep/spec +++ b/packages/rep/spec @@ -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 @@ -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 @@ -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 diff --git a/packages/rep_windows/spec b/packages/rep_windows/spec index 725e89970d..ab8d71666c 100644 --- a/packages/rep_windows/spec +++ b/packages/rep_windows/spec @@ -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 @@ -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 @@ -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 diff --git a/src/code.cloudfoundry.org/diego-ssh b/src/code.cloudfoundry.org/diego-ssh index b0cbc38ed4..357fec9f6c 160000 --- a/src/code.cloudfoundry.org/diego-ssh +++ b/src/code.cloudfoundry.org/diego-ssh @@ -1 +1 @@ -Subproject commit b0cbc38ed4de6b6747e90884ae6fecdcca294c3b +Subproject commit 357fec9f6c1f8d8d7e66634da80c0f172ff59678 diff --git a/src/code.cloudfoundry.org/executor b/src/code.cloudfoundry.org/executor index 4ec5c928c9..89016545a5 160000 --- a/src/code.cloudfoundry.org/executor +++ b/src/code.cloudfoundry.org/executor @@ -1 +1 @@ -Subproject commit 4ec5c928c92c1c587aec5e0a02517e9cf68e373f +Subproject commit 89016545a576e1c3075366901e892de021d4019d diff --git a/src/code.cloudfoundry.org/uaa-go-client b/src/code.cloudfoundry.org/uaa-go-client index 0c176509a1..3263620d3e 160000 --- a/src/code.cloudfoundry.org/uaa-go-client +++ b/src/code.cloudfoundry.org/uaa-go-client @@ -1 +1 @@ -Subproject commit 0c176509a1f10639c9584a34d389f24d86e3215c +Subproject commit 3263620d3e98734f6886ae4f8de49e0d844d10e9 diff --git a/src/github.com/dgrijalva/jwt-go b/src/github.com/dgrijalva/jwt-go index f62f64ea22..dbeaa9332f 160000 --- a/src/github.com/dgrijalva/jwt-go +++ b/src/github.com/dgrijalva/jwt-go @@ -1 +1 @@ -Subproject commit f62f64ea222e5e6d6d86421b5507b0862a3ebf7f +Subproject commit dbeaa9332f19a944acb5736b4456cfcc02140e29