aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-11-15 13:52:08 +0100
committerMartin Polden <mpolden@mpolden.no>2022-11-15 14:03:57 +0100
commit328dd453bd91dc15b1cc733bce5ef895b8d4091e (patch)
treec8676688ecd7c13ed7194fdd376517fa8ade67a1 /controller-api
parent1b538760a2e23a2ca81bda94b6bda26eab40a191 (diff)
Stop setting OS upgrade budget
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java3
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeUpgrade.java10
2 files changed, 2 insertions, 11 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index 395f0642965..a65b35b4dbe 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -9,7 +9,6 @@ import com.yahoo.config.provision.TenantName;
import com.yahoo.config.provision.zone.ZoneId;
import java.net.URI;
-import java.time.Duration;
import java.util.List;
import java.util.Map;
@@ -58,7 +57,7 @@ public interface NodeRepository {
void upgrade(ZoneId zone, NodeType type, Version version, boolean allowDowngrade);
/** Upgrade OS for all nodes of given type to a new version */
- void upgradeOs(ZoneId zone, NodeType type, Version version, Duration upgradeBudget);
+ void upgradeOs(ZoneId zone, NodeType type, Version version);
/** Get target versions for upgrades in given zone */
TargetVersions targetVersionsOf(ZoneId zone);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeUpgrade.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeUpgrade.java
index 8086ecc7e3c..e007c8cae81 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeUpgrade.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeUpgrade.java
@@ -22,16 +22,12 @@ public class NodeUpgrade {
@JsonProperty("force")
private final boolean force;
- @JsonProperty("upgradeBudget")
- private final String upgradeBudget;
-
@JsonCreator
public NodeUpgrade(@JsonProperty("version") String version, @JsonProperty("osVersion") String osVersion,
- @JsonProperty("force") boolean force, @JsonProperty("upgradeBudget") String upgradeBudget) {
+ @JsonProperty("force") boolean force) {
this.version = version;
this.osVersion = osVersion;
this.force = force;
- this.upgradeBudget = upgradeBudget;
}
public String getVersion() {
@@ -46,8 +42,4 @@ public class NodeUpgrade {
return force;
}
- public String getUpgradeBudget() {
- return upgradeBudget;
- }
-
}