diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-10-13 14:30:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 14:30:07 +0200 |
| commit | 918adc0fa08d999a151a5d07a83d99f54567c1bd (patch) | |
| tree | 1d51aacee160da1312763b9ff30b91b67ef002ab /config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | |
| parent | 7969913ee302ec4a19c38c529b99ce12edddb5b7 (diff) | |
| parent | 11fb09016d44de8514019d29908dfb7d4c623840 (diff) | |
Merge pull request #24406 from vespa-engine/bratseth/instance-tags
Add instance tags [run-systemtest]
Diffstat (limited to 'config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java')
| -rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 7b483d0603c..e61ea01a99a 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -17,6 +17,7 @@ import com.yahoo.config.model.application.AbstractApplicationPackage; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.InstanceName; +import com.yahoo.config.provision.Tags; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.io.HexDump; @@ -138,6 +139,7 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { deployData.getDeployTimestamp(), deployData.isInternalRedeploy(), deployData.getApplicationId(), + deployData.getTags(), computeCheckSum(appDir), deployData.getGeneration(), deployData.getCurrentlyActiveGeneration()); @@ -484,6 +486,7 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { ApplicationId.from(TenantName.defaultName(), ApplicationName.from(originalAppDir), InstanceName.defaultName()), + Tags.empty(), "", 0L, 0L); @@ -583,7 +586,8 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { inputXml, metaData.getApplicationId().instance(), zone.environment(), - zone.region()) + zone.region(), + metaData.getTags()) .run(); try (FileOutputStream outputStream = new FileOutputStream(destination)) { |