Skip to content
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

crd/ContourDeployment: Add fields for (update)Strategy #4713

Merged
merged 22 commits into from
Nov 28, 2022
Merged

crd/ContourDeployment: Add fields for (update)Strategy #4713

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
362ac31
add field: updateStrategy/strategy for envoy & contour to crd/Contour…
izturn Sep 11, 2022
95065dd
add changelog
izturn Sep 11, 2022
155f1af
add changelog
izturn Sep 13, 2022
f9d2a3f
update yaml
izturn Sep 13, 2022
324e645
merge & fix conflict
izturn Oct 18, 2022
feb1f36
Merge remote-tracking branch 'upstream/main' into feat/update-strategy
izturn Oct 31, 2022
9250a0d
split ContourDeployment & add ut
izturn Oct 31, 2022
e34c1df
split ContourDeployment & add ut
izturn Oct 31, 2022
efc0f1d
make golint happy
izturn Oct 31, 2022
c72ecec
merge & fix conflict
izturn Nov 3, 2022
a620a77
make lint
izturn Nov 3, 2022
4e7cae3
Merge remote-tracking branch 'upstream/main' into feat/update-strategy
izturn Nov 4, 2022
349bcad
make generate
izturn Nov 4, 2022
6eb8800
little refactor
izturn Nov 7, 2022
caf39bb
fix typo
izturn Nov 7, 2022
e2a3515
Merge remote-tracking branch 'upstream/main' into feat/update-strategy
izturn Nov 8, 2022
9d5732b
fix ut
izturn Nov 8, 2022
30b5836
make check happy
izturn Nov 8, 2022
1890466
make generate
izturn Nov 10, 2022
5b91fb9
little refactor
izturn Nov 16, 2022
edf13ba
Merge remote-tracking branch 'upstream/main' into feat/update-strategy
izturn Nov 20, 2022
e0b0c12
check replicas before use it
izturn Nov 20, 2022
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
15 changes: 15 additions & 0 deletions apis/projectcontour/v1alpha1/contourdeployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package v1alpha1
import (
"fmt"

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down Expand Up @@ -105,6 +106,10 @@ type ContourSettings struct {
// More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
// +optional
Resources corev1.ResourceRequirements `json:"resources,omitempty"`

// Strategy describes the deployment strategy to use to replace existing Contour pods with new ones.
// +optional
Strategy *appsv1.DeploymentStrategy `json:"strategy,omitempty"`
}

// EnvoySettings contains settings for the Envoy part of the installation,
Expand Down Expand Up @@ -151,6 +156,16 @@ type EnvoySettings struct {
// More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
// +optional
Resources corev1.ResourceRequirements `json:"resources,omitempty"`

// An update strategy to replace existing Envoy DaemonSet pods with new pods.
// when envoy be running as a `Deployment`,it's must be nil
// +optional
UpdateStrategy *appsv1.DaemonSetUpdateStrategy `json:"updateStrategy,omitempty"`

// Strategy describes the deployment strategy to use to replace existing Envoy pods with new ones.
// when envoy be running as a `DaemonSet`,it's must be nil
// +optional
Strategy *appsv1.DeploymentStrategy `json:"strategy,omitempty"`
izturn marked this conversation as resolved.
Show resolved Hide resolved
}

// WorkloadType is the type of Kubernetes workload to use for a component.
Expand Down
16 changes: 16 additions & 0 deletions apis/projectcontour/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions changelogs/unreleased/4713-izturn-small.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add (update)Strategy configurability to ContourDeployment resource for components.
169 changes: 169 additions & 0 deletions examples/contour/01-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,57 @@ spec:
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
strategy:
description: Strategy describes the deployment strategy to use
to replace existing Contour pods with new ones.
properties:
rollingUpdate:
description: 'Rolling update config params. Present only if
DeploymentStrategyType = RollingUpdate. --- TODO: Update
this to follow our convention for oneOf, whatever we decide
it to be.'
properties:
maxSurge:
anyOf:
- type: integer
- type: string
description: 'The maximum number of pods that can be scheduled
above the desired number of pods. Value can be an absolute
number (ex: 5) or a percentage of desired pods (ex:
10%). This can not be 0 if MaxUnavailable is 0. Absolute
number is calculated from percentage by rounding up.
Defaults to 25%. Example: when this is set to 30%, the
new ReplicaSet can be scaled up immediately when the
rolling update starts, such that the total number of
old and new pods do not exceed 130% of desired pods.
Once old pods have been killed, new ReplicaSet can be
scaled up further, ensuring that total number of pods
running at any time during the update is at most 130%
of desired pods.'
x-kubernetes-int-or-string: true
maxUnavailable:
anyOf:
- type: integer
- type: string
description: 'The maximum number of pods that can be unavailable
during the update. Value can be an absolute number (ex:
5) or a percentage of desired pods (ex: 10%). Absolute
number is calculated from percentage by rounding down.
This can not be 0 if MaxSurge is 0. Defaults to 25%.
Example: when this is set to 30%, the old ReplicaSet
can be scaled down to 70% of desired pods immediately
when the rolling update starts. Once new pods are ready,
old ReplicaSet can be scaled down further, followed
by scaling up the new ReplicaSet, ensuring that the
total number of pods available at all times during the
update is at least 70% of desired pods.'
x-kubernetes-int-or-string: true
type: object
type:
description: Type of deployment. Can be "Recreate" or "RollingUpdate".
Default is RollingUpdate.
type: string
type: object
type: object
envoy:
description: Envoy specifies deployment-time settings for the Envoy
Expand Down Expand Up @@ -2694,6 +2745,124 @@ spec:
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
strategy:
description: Strategy describes the deployment strategy to use
to replace existing Envoy pods with new ones. when envoy be
running as a `DaemonSet`,it's must be nil
properties:
rollingUpdate:
description: 'Rolling update config params. Present only if
DeploymentStrategyType = RollingUpdate. --- TODO: Update
this to follow our convention for oneOf, whatever we decide
it to be.'
properties:
maxSurge:
anyOf:
- type: integer
- type: string
description: 'The maximum number of pods that can be scheduled
above the desired number of pods. Value can be an absolute
number (ex: 5) or a percentage of desired pods (ex:
10%). This can not be 0 if MaxUnavailable is 0. Absolute
number is calculated from percentage by rounding up.
Defaults to 25%. Example: when this is set to 30%, the
new ReplicaSet can be scaled up immediately when the
rolling update starts, such that the total number of
old and new pods do not exceed 130% of desired pods.
Once old pods have been killed, new ReplicaSet can be
scaled up further, ensuring that total number of pods
running at any time during the update is at most 130%
of desired pods.'
x-kubernetes-int-or-string: true
maxUnavailable:
anyOf:
- type: integer
- type: string
description: 'The maximum number of pods that can be unavailable
during the update. Value can be an absolute number (ex:
5) or a percentage of desired pods (ex: 10%). Absolute
number is calculated from percentage by rounding down.
This can not be 0 if MaxSurge is 0. Defaults to 25%.
Example: when this is set to 30%, the old ReplicaSet
can be scaled down to 70% of desired pods immediately
when the rolling update starts. Once new pods are ready,
old ReplicaSet can be scaled down further, followed
by scaling up the new ReplicaSet, ensuring that the
total number of pods available at all times during the
update is at least 70% of desired pods.'
x-kubernetes-int-or-string: true
type: object
type:
description: Type of deployment. Can be "Recreate" or "RollingUpdate".
Default is RollingUpdate.
type: string
type: object
updateStrategy:
description: An update strategy to replace existing Envoy DaemonSet
pods with new pods. when envoy be running as a `Deployment`,it's
must be nil
properties:
rollingUpdate:
description: 'Rolling update config params. Present only if
type = "RollingUpdate". --- TODO: Update this to follow
our convention for oneOf, whatever we decide it to be. Same
as Deployment `strategy.rollingUpdate`. See https://github.com/kubernetes/kubernetes/issues/35345'
properties:
maxSurge:
anyOf:
- type: integer
- type: string
description: 'The maximum number of nodes with an existing
available DaemonSet pod that can have an updated DaemonSet
pod during during an update. Value can be an absolute
number (ex: 5) or a percentage of desired pods (ex:
10%). This can not be 0 if MaxUnavailable is 0. Absolute
number is calculated from percentage by rounding up
to a minimum of 1. Default value is 0. Example: when
this is set to 30%, at most 30% of the total number
of nodes that should be running the daemon pod (i.e.
status.desiredNumberScheduled) can have their a new
pod created before the old pod is marked as deleted.
The update starts by launching new pods on 30% of nodes.
Once an updated pod is available (Ready for at least
minReadySeconds) the old DaemonSet pod on that node
is marked deleted. If the old pod becomes unavailable
for any reason (Ready transitions to false, is evicted,
or is drained) an updated pod is immediatedly created
on that node without considering surge limits. Allowing
surge implies the possibility that the resources consumed
by the daemonset on any given node can double if the
readiness check fails, and so resource intensive daemonsets
should take into account that they may cause evictions
during disruption.'
x-kubernetes-int-or-string: true
maxUnavailable:
anyOf:
- type: integer
- type: string
description: 'The maximum number of DaemonSet pods that
can be unavailable during the update. Value can be an
absolute number (ex: 5) or a percentage of total number
of DaemonSet pods at the start of the update (ex: 10%).
Absolute number is calculated from percentage by rounding
up. This cannot be 0 if MaxSurge is 0 Default value
is 1. Example: when this is set to 30%, at most 30%
of the total number of nodes that should be running
the daemon pod (i.e. status.desiredNumberScheduled)
can have their pods stopped for an update at any given
time. The update starts by stopping at most 30% of those
DaemonSet pods and then brings up new DaemonSet pods
in their place. Once the new pods are available, it
then proceeds onto other DaemonSet pods, thus ensuring
that at least 70% of original number of DaemonSet pods
are available at all times during the update.'
x-kubernetes-int-or-string: true
type: object
type:
description: Type of daemon set update. Can be "RollingUpdate"
or "OnDelete". Default is RollingUpdate.
type: string
type: object
workloadType:
description: WorkloadType is the type of workload to install Envoy
as. Choices are DaemonSet and Deployment. If unset, defaults
Expand Down
Loading