Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Jvenstad/zone cleanup 4" | Jon Marius Venstad | 2018-01-02 | 8 | -206/+9 |
| | |||||
* | Merge branch 'master' into jvenstad/zone-cleanup-4 | Jon Marius Venstad | 2018-01-02 | 7 | -69/+206 |
|\ | |||||
| * | Add dependency on container-dev | Bjørn Christian Seime | 2017-12-18 | 1 | -66/+1 |
| | | |||||
| * | Support Athenz authentication through x509 certificates | Bjørn Christian Seime | 2017-12-18 | 1 | -1/+1 |
| | | |||||
| * | Make NToken optional in AthenzPrincipal | Bjørn Christian Seime | 2017-12-18 | 1 | -2/+7 |
| | | |||||
| * | Verify that certificate is not a role certificate | Bjørn Christian Seime | 2017-12-18 | 1 | -1/+9 |
| | | |||||
| * | Move logic from determing Athenz identity from x509 certificate to AthenzUtils | Bjørn Christian Seime | 2017-12-18 | 2 | -15/+21 |
| | | |||||
| * | Add hostname verifier that verifies CN in Athenz x509 certificates | Bjørn Christian Seime | 2017-12-15 | 3 | -0/+150 |
| | | |||||
| * | Add utility method to create Athenz identity from string | Bjørn Christian Seime | 2017-12-15 | 2 | -0/+33 |
| | | |||||
* | | Split Zones and renamed it | Jon Marius Venstad | 2017-12-16 | 6 | -60/+77 |
| | | |||||
* | | Changes to Zones, a MockZones and some usages | Jon Marius Venstad | 2017-12-15 | 3 | -14/+80 |
| | | |||||
* | | Moved ZoneId to controller-api and added Zones | Jon Marius Venstad | 2017-12-14 | 6 | -8/+122 |
|/ | |||||
* | Optional<Duration> again | Jon Marius Venstad | 2017-12-14 | 1 | -2/+2 |
| | |||||
* | Correct deprecation message | Jon Marius Venstad | 2017-12-12 | 1 | -1/+1 |
| | |||||
* | Need new classes for hosted compilation | Jon Marius Venstad | 2017-12-12 | 4 | -0/+72 |
|\ | |||||
| * | Add provider for SSLContext configured with Athenz certs | Bjørn Christian Seime | 2017-12-12 | 1 | -0/+14 |
| | | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates. | ||||
| * | Add getIdentityCertificate and getRoleCertificate to ZtsClient | Bjørn Christian Seime | 2017-12-12 | 3 | -0/+58 |
| | | |||||
| * | Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient" | Arnstein Ressem | 2017-12-11 | 4 | -72/+0 |
| | | |||||
| * | Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-cert | Bjørn Christian Seime | 2017-12-11 | 4 | -0/+72 |
| |\ | | | | | | | Add getIdentityCertificate and getRoleCertificate to ZtsClient | ||||
| | * | Add provider for SSLContext configured with Athenz certs | Bjørn Christian Seime | 2017-12-11 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates. | ||||
| | * | Add getIdentityCertificate and getRoleCertificate to ZtsClient | Bjørn Christian Seime | 2017-12-07 | 3 | -0/+58 |
| | | | |||||
* | | | Added new secure config server uri stuff | Jon Marius Venstad | 2017-12-12 | 1 | -1/+8 |
| | | | |||||
* | | | Reintroduced Optional for default region and made mock consistent | Jon Marius Venstad | 2017-12-12 | 2 | -3/+3 |
| | | | |||||
* | | | DeploymentId beautification | Jon Marius Venstad | 2017-12-12 | 1 | -25/+23 |
| | | | |||||
* | | | Fix mock, move kibana stuff to hosted and add some doc | Jon Marius Venstad | 2017-12-12 | 1 | -4/+21 |
| | | | |||||
* | | | More simplifications | Jon Marius Venstad | 2017-12-11 | 1 | -1/+2 |
| | | | |||||
* | | | Removed two pointless Optional<> and replaced more (Env, Reg) with ZoneId | Jon Marius Venstad | 2017-12-11 | 1 | -3/+3 |
| | | | |||||
* | | | Replaced ZoneId getZone(ZoneId zoneId) with hasZone(ZoneId zoneId) | Jon Marius Venstad | 2017-12-11 | 1 | -2/+2 |
|/ / | |||||
* | | Need to change new code as well | Jon Marius Venstad | 2017-12-11 | 3 | -10/+16 |
|\ \ | |||||
| * | | value() -> data() | Martin Polden | 2017-12-08 | 2 | -3/+3 |
| | | | |||||
| * | | Ensure that global DNS always points to assigned rotation | Martin Polden | 2017-12-08 | 2 | -7/+13 |
| | | | |||||
* | | | Remove unused ZoneId | Jon Marius Venstad | 2017-12-08 | 1 | -13/+0 |
| | | | |||||
* | | | Replace constructor with factories | Jon Marius Venstad | 2017-12-08 | 1 | -2/+2 |
| | | | |||||
* | | | Replaced instantiation of Zone with ZoneId where applicable | Jon Marius Venstad | 2017-12-08 | 1 | -1/+1 |
| | | | |||||
* | | | Extract superclass with environment and region | Jon Marius Venstad | 2017-12-08 | 3 | -10/+10 |
| | | | |||||
* | | | Revert "Factory constructor with region/env" | Jon Marius Venstad | 2017-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit e5f2b434d614b49bef40038ec1fe1d391db62e1e. | ||||
* | | | Factory constructor with region/env | Jon Marius Venstad | 2017-12-08 | 1 | -1/+1 |
|/ / | |||||
* / | Update name service interface | Martin Polden | 2017-12-06 | 5 | -14/+129 |
|/ | |||||
* | Merge pull request #4365 from ↵ | Morten Tokle | 2017-12-06 | 17 | -0/+496 |
|\ | | | | | | | | | vespa-engine/bjorncs/move-athenz-api-to-controller-api Bjorncs/move athenz api to controller api | ||||
| * | Add class for Athenz role token | Bjørn Christian Seime | 2017-12-06 | 1 | -0/+36 |
| | | |||||
| * | Move all Athenz API classes to controller-api | Bjørn Christian Seime | 2017-12-06 | 16 | -0/+460 |
| | | | | | | | | Add package-info with ExportPackage as well. | ||||
* | | Merge pull request #4359 from vespa-engine/freva/remove-context-from-proxy | Bjørn Christian Seime | 2017-12-06 | 1 | -10/+4 |
|\ \ | |/ |/| | Remove Context from proxy methods | ||||
| * | Remove Context from proxy methods | Valerij Fredriksen | 2017-12-05 | 1 | -10/+4 |
| | | |||||
* | | Revert "Replace usage of KeyService with SecretStore" | Arnstein Ressem | 2017-12-05 | 3 | -0/+36 |
|/ | |||||
* | Merge pull request #4349 from vespa-engine/mortent/remove-keyservice | Morten Tokle | 2017-12-05 | 3 | -36/+0 |
|\ | | | | | Replace usage of KeyService with SecretStore | ||||
| * | Replace usage of KeyService with SecretStore | Morten Tokle | 2017-11-30 | 3 | -36/+0 |
| | | |||||
* | | Add removeRecord to NameService | Martin Polden | 2017-12-04 | 4 | -22/+39 |
| | | |||||
* | | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-12-01 | 1 | -0/+1 |
| | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | | Revert "Gjoranv/split parent2" | gjoranv | 2017-11-30 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #4318 from vespa-engine/gjoranv/split-parent2 | gjoranv | 2017-11-30 | 1 | -0/+1 |
|\ \ | |/ |/| | Gjoranv/split parent2 |