diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-01-15 14:51:41 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-01-15 14:51:41 +0100 |
| commit | bdeffbd5779255b9924e27c4350400936e6cca68 (patch) | |
| tree | 8ed477c258baba9150ef7622d2385114846b507b /config-model | |
| parent | a6df129da95d0271d83689467fa3da77dad360d8 (diff) | |
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 d749cdc465e..474561a0c0a 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 @@ -871,9 +871,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 } |