diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-01-15 18:39:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 18:39:30 +0100 |
| commit | 859178ef9fdff82a07cb8305a7999545b4032294 (patch) | |
| tree | bfb00a4b0e713b1ccd53a29c9cb75aab6c4c2588 /config-model | |
| parent | f1a6b783daffbdf4177f62c58bb100f5b08d30d3 (diff) | |
Revert "Revert "Athenz domain cannot be set on instance level, just on the root""
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 4 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 0f808988a15..7dba9d7cfff 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -860,9 +860,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { String athenzDnsSuffix, Zone zone, DeploymentSpec spec) { - spec.instance(app.getApplicationId().instance()) - .flatMap(instanceSpec -> instanceSpec.athenzDomain()) - .or(() -> spec.athenzDomain()) + spec.athenzDomain() .ifPresent(domain -> { AthenzService service = spec.instance(app.getApplicationId().instance()) .flatMap(instanceSpec -> instanceSpec.athenzService(zone.environment(), zone.region())) diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 6a8bc8f77b9..171112f6bd7 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -32,7 +32,6 @@ PrimitiveStep = Instance = element instance { attribute id { xsd:string } & - attribute athenz-domain { xsd:string }? & attribute athenz-service { xsd:string }? & StepExceptInstance } |