From e0fd2fbeeaa2e1aa6d39f93becacac8409095250 Mon Sep 17 00:00:00 2001 From: Bryce Date: Wed, 24 Jun 2026 08:12:22 -0700 Subject: [PATCH 1/2] ha config primary required --- .../config/deploy/ContainerDeployHighAvailabilityConfig.yml | 4 +--- .../deploy/StackSpecContainerConfigHighAvailability.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/components/schemas/containers/config/deploy/ContainerDeployHighAvailabilityConfig.yml b/components/schemas/containers/config/deploy/ContainerDeployHighAvailabilityConfig.yml index efd1f96c..040fdce1 100644 --- a/components/schemas/containers/config/deploy/ContainerDeployHighAvailabilityConfig.yml +++ b/components/schemas/containers/config/deploy/ContainerDeployHighAvailabilityConfig.yml @@ -5,6 +5,4 @@ required: properties: stale_primary_deadline: description: The amount of time that must pass between high availability checkins before an instance is considered stale. If it is the primary, a new primary will be elected after this deadline. Minimum is 15s. - oneOf: - - $ref: ../../../Duration.yml - - type: "null" + $ref: ../../../Duration.yml diff --git a/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml b/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml index baf43c14..7b3f7a9a 100644 --- a/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml +++ b/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml @@ -5,6 +5,4 @@ required: properties: stale_primary_deadline: description: The amount of time that must pass between high availability checkins before an instance is considered stale. If it is the primary, a new primary will be elected after this deadline. Minimum is 15s. - oneOf: - - $ref: ../../../components/schemas/Duration.yml - - $ref: ../StackVariable.yml + $ref: ../../../components/schemas/Duration.yml From e52e41157ae166cb5e34091403633892f4e6d486 Mon Sep 17 00:00:00 2001 From: Bryce Date: Wed, 24 Jun 2026 10:33:13 -0700 Subject: [PATCH 2/2] ha named to ha_elections --- components/schemas/containers/Container.yml | 4 ++-- components/schemas/containers/config/ContainerDeploy.yml | 4 ++-- components/schemas/containers/instances/Instance.yml | 2 +- components/schemas/containers/summaries/ContainerSummary.yml | 4 ++-- stackspec/schema/StackSpecContainerConfigDeploy.yml | 2 +- .../deploy/StackSpecContainerConfigHighAvailability.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/schemas/containers/Container.yml b/components/schemas/containers/Container.yml index fc396aa0..9b44c5dc 100644 --- a/components/schemas/containers/Container.yml +++ b/components/schemas/containers/Container.yml @@ -66,8 +66,8 @@ properties: enum: - orchestrator - type: "null" - ha: - description: High availability status of the container. Contains information about the primary instance, if any. + ha_elections: + description: High availability election status of the container. Contains information about the primary instance, if any. oneOf: - $ref: ./ha/ContainerHighAvailability.yml - type: "null" diff --git a/components/schemas/containers/config/ContainerDeploy.yml b/components/schemas/containers/config/ContainerDeploy.yml index 51530e23..fcdd433b 100644 --- a/components/schemas/containers/config/ContainerDeploy.yml +++ b/components/schemas/containers/config/ContainerDeploy.yml @@ -12,8 +12,8 @@ properties: - $ref: ../../infrastructure/DeploymentStrategyName.yml - type: "null" description: The deployment strategy to use when scaling the given container. - ha: - description: Configuration options for how the platform treats instances of this container when opting into high availability via the internal API. + ha_elections: + description: Configuration options for how the platform treats instances of this container when opting into high availability elections via the internal API. oneOf: - $ref: ./deploy/ContainerDeployHighAvailabilityConfig.yml - type: "null" diff --git a/components/schemas/containers/instances/Instance.yml b/components/schemas/containers/instances/Instance.yml index c13cf471..97fb39ef 100644 --- a/components/schemas/containers/instances/Instance.yml +++ b/components/schemas/containers/instances/Instance.yml @@ -102,7 +102,7 @@ properties: anyOf: - $ref: ../Deployment.yml - type: "null" - ha: + ha_elections: oneOf: - $ref: ./InstanceHighAvailability.yml - type: "null" diff --git a/components/schemas/containers/summaries/ContainerSummary.yml b/components/schemas/containers/summaries/ContainerSummary.yml index 4610d28a..79a687a0 100644 --- a/components/schemas/containers/summaries/ContainerSummary.yml +++ b/components/schemas/containers/summaries/ContainerSummary.yml @@ -38,8 +38,8 @@ properties: - type: "null" state: $ref: "../ContainerState.yml" - ha: - description: High availability status of the container. Contains information about the primary instance, if any. + ha_elections: + description: High availability elections status of the container. Contains information about the primary instance, if any. oneOf: - $ref: ../ha/ContainerHighAvailability.yml - type: "null" diff --git a/stackspec/schema/StackSpecContainerConfigDeploy.yml b/stackspec/schema/StackSpecContainerConfigDeploy.yml index 190b469f..15939a03 100644 --- a/stackspec/schema/StackSpecContainerConfigDeploy.yml +++ b/stackspec/schema/StackSpecContainerConfigDeploy.yml @@ -35,7 +35,7 @@ properties: - type: "null" - $ref: StackVariable.yml - ha: + ha_elections: oneOf: - $ref: ./deploy/StackSpecContainerConfigHighAvailability.yml - type: "null" diff --git a/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml b/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml index 7b3f7a9a..b2e05b96 100644 --- a/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml +++ b/stackspec/schema/deploy/StackSpecContainerConfigHighAvailability.yml @@ -1,5 +1,5 @@ title: StackSpecContainerConfigHighAvailability -description: Configuration options for how the platform treats instances of this container when opting into high availability via the internal API. +description: Configuration options for how the platform treats instances of this container when opting into high availability elections via the internal API. required: - stale_primary_deadline properties: