Skip to content

OCPBUGS-86719: Use zero-downtime rollout strategy for console pods #1168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asadawar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-86719: Use zero-downtime rollout strategy for console pods #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions pkg/console/subresource/deployment/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,32 @@ func withAffinity(
func withStrategy(deployment *appsv1.Deployment, infrastructureConfig *configv1.Infrastructure) {
rollingUpdateParams := &appsv1.RollingUpdateDeployment{}
if ShouldDeployHA(infrastructureConfig) {
rollingUpdateParams = &appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(3),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(1),
},
topology := infrastructureConfig.Status.ControlPlaneTopology
if topology == configv1.DualReplicaTopologyMode || topology == configv1.HighlyAvailableArbiterMode {
// On 2-node topologies the required pod anti-affinity prevents
// scheduling a surge pod when every eligible node already runs
// a console pod, so maxUnavailable must be >= 1 to allow the
// rollout to make progress.
rollingUpdateParams = &appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(1),
},
}
} else {
// On 3+ node topologies a free node is available for the surge
// pod, so maxUnavailable=0 guarantees zero-downtime rollouts:
// no old pod is terminated until its replacement is ready.
rollingUpdateParams = &appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(0),
},
}
}
}
deployment.Spec.Strategy.RollingUpdate = rollingUpdateParams
Expand Down
62 changes: 50 additions & 12 deletions pkg/console/subresource/deployment/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ func TestDefaultDeployment(t *testing.T) {
Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(3),
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(1),
IntVal: int32(0),
},
},
},
Expand Down Expand Up @@ -343,10 +343,10 @@ func TestDefaultDeployment(t *testing.T) {
Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(3),
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(1),
IntVal: int32(0),
},
},
},
Expand Down Expand Up @@ -494,10 +494,10 @@ func TestDefaultDeployment(t *testing.T) {
Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(3),
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(1),
IntVal: int32(0),
},
},
},
Expand Down Expand Up @@ -1518,11 +1518,21 @@ func TestWithStrategy(t *testing.T) {
infrastructureConfigSingleReplica := infrastructureConfigWithTopology(configv1.SingleReplicaTopologyMode, configv1.SingleReplicaTopologyMode)
infrastructureConfigExternalTopologyHighlyAvailable := infrastructureConfigWithTopology(configv1.ExternalTopologyMode, configv1.HighlyAvailableTopologyMode)
infrastructureConfigExternalTopologySingleReplica := infrastructureConfigWithTopology(configv1.ExternalTopologyMode, configv1.SingleReplicaTopologyMode)
infrastructureConfigDualReplica := infrastructureConfigWithTopology(configv1.DualReplicaTopologyMode, configv1.HighlyAvailableTopologyMode)
infrastructureConfigArbiter := infrastructureConfigWithTopology(configv1.HighlyAvailableArbiterMode, configv1.HighlyAvailableTopologyMode)

singleReplicaStrategy := appsv1.RollingUpdateDeployment{}
highAvailStrategy := appsv1.RollingUpdateDeployment{
zeroDowntimeStrategy := appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(3),
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(0),
},
}
constrainedHAStrategy := appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(1),
Expand Down Expand Up @@ -1557,7 +1567,7 @@ func TestWithStrategy(t *testing.T) {
want: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{
Strategy: appsv1.DeploymentStrategy{
RollingUpdate: &highAvailStrategy,
RollingUpdate: &zeroDowntimeStrategy,
},
},
},
Expand Down Expand Up @@ -1585,7 +1595,35 @@ func TestWithStrategy(t *testing.T) {
want: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{
Strategy: appsv1.DeploymentStrategy{
RollingUpdate: &highAvailStrategy,
RollingUpdate: &zeroDowntimeStrategy,
},
},
},
},
{
name: "Test DualReplica Strategy uses maxUnavailable=1",
args: args{
deployment: &appsv1.Deployment{},
infrastructureConfig: infrastructureConfigDualReplica,
},
want: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{
Strategy: appsv1.DeploymentStrategy{
RollingUpdate: &constrainedHAStrategy,
},
},
},
},
{
name: "Test Arbiter Strategy uses maxUnavailable=1",
args: args{
deployment: &appsv1.Deployment{},
infrastructureConfig: infrastructureConfigArbiter,
},
want: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{
Strategy: appsv1.DeploymentStrategy{
RollingUpdate: &constrainedHAStrategy,
},
},
},
Expand Down Expand Up @@ -1891,10 +1929,10 @@ func TestDefaultDownloadsDeployment(t *testing.T) {
Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1.RollingUpdateDeployment{
MaxSurge: &intstr.IntOrString{
IntVal: int32(3),
IntVal: int32(1),
},
MaxUnavailable: &intstr.IntOrString{
IntVal: int32(1),
IntVal: int32(0),
},
},
},
Expand Down