diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-04-01 14:34:03 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-04-01 14:34:03 +0200 |
| commit | 46a06d8486c8ab5b463f8b9996012d259b9ccbb0 (patch) | |
| tree | c96a808e5e5181e89e1cb81ddbca538dde70431c /config-model/src/main | |
| parent | b012478bd6aed5cf4d2f62854b6d800b8c020b0e (diff) | |
Allow destructive changes in manually deployed zones
Diffstat (limited to 'config-model/src/main')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 910eff065d1..7a981cd6a53 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -121,7 +121,12 @@ public class DeployState implements ConfigDefinitionStore { this.importedModels = new ImportedMlModels(applicationPackage.getFileReference(ApplicationPackage.MODELS_DIR), modelImporters); - this.validationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty); + this.validationOverrides = + zone.environment().isManuallyDeployed() + ? ValidationOverrides.all // Don't protect manually deployed zones + : applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml) + .orElse(ValidationOverrides.empty); + this.wantedNodeVespaVersion = wantedNodeVespaVersion; this.now = now; } |