summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Collapse)AuthorAgeFilesLines
...
| * Sort chunk ids by numerical orderJon Marius Venstad2018-10-251-1/+2
| |
| * Use smaller chunks for logs to reduce ZK traffic (just in case)Jon Marius Venstad2018-10-251-1/+1
| |
| * Indicate application, job and step in Vespa log (always the intention)Jon Marius Venstad2018-10-251-3/+1
| |
* | Remove obsolete testMartin Polden2018-10-252-42/+0
| |
* | Remove obsolete filterMartin Polden2018-10-2512-28/+6
| |
* | Revert "Remove PR instances"Martin Polden2018-10-254-92/+0
| | | | | | | | This reverts commit c49cdc0e0ef900cb4cda93bcfdb88692767ae46e.
* | Merge pull request #7444 from vespa-engine/mpolden/controller-aclsMartin Polden2018-10-252-4/+2
|\ \ | | | | | | Support ACLs for controllers and hosts
| * | Remove unused parameterMartin Polden2018-10-252-4/+2
| |/
* | Merge pull request #7443 from vespa-engine/mpolden/remove-unused-apiJon Marius Venstad2018-10-253-41/+4
|\ \ | |/ |/| Remove unused API path
| * Remove unused test responseMartin Polden2018-10-252-8/+1
| |
| * Remove unused API pathMartin Polden2018-10-252-33/+3
| |
* | Added API for updating metrics on controller (#7378)olaaun2018-10-253-0/+313
| | | | | | | | | | | | * Added API for updating metrics on controller * Changed expected payload format
* | Merge pull request #7436 from vespa-engine/bjorncs/athenz-okta-tenancyMorten Tokle2018-10-2526-632/+381
|\ \ | | | | | | Bjorncs/athenz okta tenancy
| * | Remove unused parameters from athenz.defBjørn Christian Seime2018-10-241-29/+0
| | |
| * | Create Athenz tenancy using OktaBjørn Christian Seime2018-10-2424-499/+381
| | | | | | | | | | | | | | | | | | | | | - Use ZmsClient from vespa-athenz in AthenzClientFactory - Rename ZmsClientImpl (controller-server) to ZmsClientFacade and modify it to use ZmsClient - Move ApplicationAction and HostedAthenzIdentities to controller-server - Change ZmsClientMock to mock ZmsClient from vespa-athenz
| * | Remove UserAuthWithAthenzPrincipalFilterBjørn Christian Seime2018-10-181-104/+0
| | |
* | | Catch the right exceptionJon Marius Venstad2018-10-242-9/+7
| |/ |/|
* | Merge pull request #7400 from vespa-engine/mpolden/remove-pr-instancesMartin Polden2018-10-244-0/+92
|\ \ | | | | | | Remove PR instances
| * | Remove PR instancesMartin Polden2018-10-224-0/+92
| | |
* | | Merge pull request #7416 from ↵Jon Bratseth2018-10-234-8/+21
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-7116-revert-7098-frodelu/combined-api-uris Take #2: Adding getConfigServerApiUris() with both cfg servers and VIP [VESPA-12701]
| * | | Revert "Revert "Adding getConfigServerApiUris() to include both cfg servers ↵Frode Lundgren2018-10-234-8/+21
| |/ / | | | | | | | | | and VIP [VESPA-12701]""
* | | Merge with masterJon Bratseth2018-10-2320-43/+150
|\ \ \
| * \ \ Merge pull request #7428 from ↵Jon Bratseth2018-10-233-3/+75
| |\ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/abort-running-deployment-jobs Abort internally run jobs whenever new application change is accepted
| | * | | Abort internally run jobs whenever new application change is acceptedJon Marius Venstad2018-10-233-3/+75
| | | | |
| * | | | Merge pull request #7395 from vespa-engine/mpolden/remove-prepareHarald Musum2018-10-231-3/+6
| |\ \ \ \ | | |/ / / | |/| | | Remove deprecated prepare
| | * | | Update javadocMartin Polden2018-10-221-3/+6
| | |/ /
| * | | Allow admins and operators to cancel hosted deployment jobsJon Marius Venstad2018-10-234-9/+30
| | | |
| * | | Expose whether an application is deployed internallyJon Marius Venstad2018-10-2311-11/+16
| | | |
| * | | Accept optional project id for new pipeline submissionsJon Marius Venstad2018-10-238-17/+23
| |/ /
* | | Remove orhphan commentJon Bratseth2018-10-221-2/+0
| | |
* | | Don't make other changes when a zone is suspendedJon Bratseth2018-10-224-11/+73
| | |
* | | Test isSuspendedJon Bratseth2018-10-221-0/+23
| | |
* | | Add suspended to application/v4Jon Bratseth2018-10-225-0/+47
|/ /
* | Read certificate chainMorten Tokle2018-10-191-2/+3
| |
* | Merge pull request #7360 from vespa-engine/bratseth/handle-major-versionJon Bratseth2018-10-184-0/+50
|\ \ | |/ |/| Bratseth/handle major version
| * Don't upgrade if major version i pinnedJon Bratseth2018-10-184-0/+50
| | | | | | | | | | Add major-version to deployment as that makes it available to deployment orchestration.
* | Add SSL provider for configuring controller HTTPS connectorMartin Polden2018-10-186-0/+255
|/
* Remove deprecated types from vespa-athenzBjørn Christian Seime2018-10-171-1/+1
|
* Merge pull request #7324 from vespa-engine/jvenstad/systemtest-framework-cleanupJon Marius Venstad2018-10-162-2/+30
|\ | | | | Get list of storage clusters from config server, and add to test config
| * Content cluster, instead of storage clusterJon Marius Venstad2018-10-162-3/+3
| |
| * Get list of storage clusters from config server, and add to test configJon Marius Venstad2018-10-162-2/+30
| |
* | Revert 7315 revert 7274 olaaun/contact info maintainer feed to api (#7320)olaaun2018-10-167-43/+145
| | | | | | | | | | | | | | | | * Revert "Revert "ContactInformationMaintainer now feeds to ContactInfoAPI instead of d… (#7274)" (#7315)" This reverts commit 0a9e36c185cf555dd851b065c16ef720665dd906. * Changed authorities config from string to list. Shortened namespace.
* | Revert "ContactInformationMaintainer now feeds to ContactInfoAPI instead of ↵olaaun2018-10-157-145/+43
| | | | | | | | | | d… (#7274)" (#7315) This reverts commit ebad90033c69645616b644fc06e5e789507ecad0.
* | ContactInformationMaintainer now feeds to ContactInfoAPI instead of d… (#7274)olaaun2018-10-157-43/+145
|/ | | | | | | | * ContactInformationMaintainer now feeds to ContactInfoAPI instead of directly writing to database * Retrieve tenants from API instead of controller. Added ApiHostnameProvider. * API config now is now string instead of list. Removed unused imports. hostname -> authority
* Never downgrade system versionMartin Polden2018-10-1011-184/+241
|
* Avoid ZK read when checking maintainer systemMartin Polden2018-10-104-14/+57
|
* Remove unused injected classMartin Polden2018-10-101-2/+1
|
* Replaced Slime usage with String. Removed unused importsOla Aunrønning2018-10-093-15/+8
|
* Only use persistent contact info. Moved slime serialization. Several other ↵Ola Aunrønning2018-10-097-209/+62
| | | | fixes as well
* Added slime functionality to Contact,tests, and system check for MaintainerOla Aunrønning2018-10-086-31/+215
|