Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d50248531c | |||
| 4007f54279 |
@@ -153,7 +153,7 @@ spec:
|
|||||||
image:
|
image:
|
||||||
repository: git.ryuvia.com/niklas/terdut-server
|
repository: git.ryuvia.com/niklas/terdut-server
|
||||||
tag: v0.9.3
|
tag: v0.9.3
|
||||||
replicas: 1 # terdut-server is not horizontally-scale-tested; keep the field, default 1
|
replicas: 2 # default since terdut-server v0.36.0's advisory locks; see TerdutServerSpec.Replicas
|
||||||
networking:
|
networking:
|
||||||
hostname: terdut.example.com
|
hostname: terdut.example.com
|
||||||
servicePort: 8080
|
servicePort: 8080
|
||||||
@@ -244,10 +244,10 @@ no custom wrapper buys anything for any of these, matching how
|
|||||||
CloudNativePG and the Zalando postgres-operator both expose the same
|
CloudNativePG and the Zalando postgres-operator both expose the same
|
||||||
knobs. `affinity` is pure user-supplied passthrough, not a
|
knobs. `affinity` is pure user-supplied passthrough, not a
|
||||||
toggle-plus-generated-default the way a multi-replica-aware operator's
|
toggle-plus-generated-default the way a multi-replica-aware operator's
|
||||||
pod anti-affinity typically is: this operator never auto-generates
|
pod anti-affinity typically is: even though `replicas` now defaults to 2
|
||||||
affinity of its own, since `replicas` above 1 isn't a supported topology
|
(terdut-server v0.36.0's advisory locks made that safe, §4.1's own
|
||||||
(the sweeper/notifier singleton constraint, §4.1's own illustrative YAML
|
illustrative YAML comment), this operator still never auto-generates
|
||||||
comment). `spec.pod.disruptionBudget` is the one field here that isn't a
|
affinity of its own. `spec.pod.disruptionBudget` is the one field here that isn't a
|
||||||
straight PodTemplateSpec knob — when set, the controller reconciles a
|
straight PodTemplateSpec knob — when set, the controller reconciles a
|
||||||
`PodDisruptionBudget` selecting this `TerdutServer`'s pods; clearing it
|
`PodDisruptionBudget` selecting this `TerdutServer`'s pods; clearing it
|
||||||
deletes any it previously created (§7). `minAvailable`/`maxUnavailable`
|
deletes any it previously created (§7). `minAvailable`/`maxUnavailable`
|
||||||
@@ -832,10 +832,12 @@ what it was, a separate install, until someone deletes it.
|
|||||||
- Automatic Deployment restart on upstream Postgres credential rotation.
|
- Automatic Deployment restart on upstream Postgres credential rotation.
|
||||||
- `spec.pod.priorityClassName`, pod-label passthrough beyond
|
- `spec.pod.priorityClassName`, pod-label passthrough beyond
|
||||||
`spec.pod.annotations`, and a HorizontalPodAutoscaler for `TerdutServer`
|
`spec.pod.annotations`, and a HorizontalPodAutoscaler for `TerdutServer`
|
||||||
— all considered alongside §4.1's `spec.pod` and explicitly left out of
|
— all considered alongside §4.1's `spec.pod` and left out of that round.
|
||||||
that round: an HPA in particular would actively contradict
|
An HPA no longer contradicts anything now that `spec.replicas` defaults
|
||||||
`spec.replicas`'s own stance that this operator doesn't support more
|
to 2 (terdut-server v0.36.0's advisory locks), but it is still a
|
||||||
than one replica (the sweeper/notifier singleton constraint).
|
separate, not-yet-made decision: a fixed replica count has no scaling
|
||||||
|
metric, min/max bounds, or cooldown behaviour to get right, and nobody
|
||||||
|
has asked for it yet.
|
||||||
- Admission webhooks / CEL-only validation limits (e.g. verifying a
|
- Admission webhooks / CEL-only validation limits (e.g. verifying a
|
||||||
`teamRef` exists at admission time rather than surfacing it as a status
|
`teamRef` exists at admission time rather than surfacing it as a status
|
||||||
condition after the fact).
|
condition after the fact).
|
||||||
|
|||||||
@@ -229,11 +229,11 @@ type PodSpec struct {
|
|||||||
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
|
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
|
||||||
|
|
||||||
// affinity covers node affinity, pod affinity and pod anti-affinity in
|
// affinity covers node affinity, pod affinity and pod anti-affinity in
|
||||||
// one field -- unlike a multi-replica-aware operator, this one never
|
// one field -- even though replicas now defaults to 2 (see
|
||||||
// generates a default anti-affinity itself (replicas above 1 isn't a
|
// TerdutServerSpec.Replicas's own doc comment), this operator still
|
||||||
// supported topology, see TerdutServerSpec.Replicas's own doc comment),
|
// never generates a default anti-affinity of its own the way a
|
||||||
// so this is pure user-supplied passthrough, not a toggle-plus-generated-
|
// multi-replica-aware operator typically would, so this stays pure
|
||||||
// default.
|
// user-supplied passthrough, not a toggle-plus-generated-default.
|
||||||
// +optional
|
// +optional
|
||||||
Affinity *corev1.Affinity `json:"affinity,omitempty"`
|
Affinity *corev1.Affinity `json:"affinity,omitempty"`
|
||||||
|
|
||||||
@@ -301,10 +301,14 @@ type TerdutServerSpec struct {
|
|||||||
// +required
|
// +required
|
||||||
Image ImageSpec `json:"image"`
|
Image ImageSpec `json:"image"`
|
||||||
|
|
||||||
// replicas. terdut-server is not horizontally-scale-tested; keep this
|
// replicas. Defaults to 2: terdut-server v0.36.0 put the sweeper, the
|
||||||
// at its default of 1 unless you've verified otherwise -- the sweeper
|
// notifier and the migration runner each behind a Postgres advisory
|
||||||
// and the notifier are unsynchronised singletons.
|
// lock, and gave incident creation its own conflict resolution, so
|
||||||
// +kubebuilder:default=1
|
// more than one replica no longer double-pages, races a migration, or
|
||||||
|
// drops a webhook payload. image.tag must be v0.36.0 or newer for
|
||||||
|
// that to hold -- an older terdut-server has none of these guards,
|
||||||
|
// and this field does not check the tag for you.
|
||||||
|
// +kubebuilder:default=2
|
||||||
// +optional
|
// +optional
|
||||||
Replicas int32 `json:"replicas,omitempty"`
|
Replicas int32 `json:"replicas,omitempty"`
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ type: application
|
|||||||
# These fields decide nothing: `make helm-package` passes --version and
|
# These fields decide nothing: `make helm-package` passes --version and
|
||||||
# --app-version from the release tag (same reasoning as terdut-server's own
|
# --app-version from the release tag (same reasoning as terdut-server's own
|
||||||
# chart). They're for whoever reads the tree before a tag exists.
|
# chart). They're for whoever reads the tree before a tag exists.
|
||||||
version: 0.3.0
|
version: 0.4.0
|
||||||
appVersion: "v0.3.0"
|
appVersion: "v0.4.0"
|
||||||
|
|
||||||
keywords:
|
keywords:
|
||||||
- kubernetes
|
- kubernetes
|
||||||
|
|||||||
@@ -327,11 +327,11 @@ spec:
|
|||||||
affinity:
|
affinity:
|
||||||
description: |-
|
description: |-
|
||||||
affinity covers node affinity, pod affinity and pod anti-affinity in
|
affinity covers node affinity, pod affinity and pod anti-affinity in
|
||||||
one field -- unlike a multi-replica-aware operator, this one never
|
one field -- even though replicas now defaults to 2 (see
|
||||||
generates a default anti-affinity itself (replicas above 1 isn't a
|
TerdutServerSpec.Replicas's own doc comment), this operator still
|
||||||
supported topology, see TerdutServerSpec.Replicas's own doc comment),
|
never generates a default anti-affinity of its own the way a
|
||||||
so this is pure user-supplied passthrough, not a toggle-plus-generated-
|
multi-replica-aware operator typically would, so this stays pure
|
||||||
default.
|
user-supplied passthrough, not a toggle-plus-generated-default.
|
||||||
properties:
|
properties:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
description: Describes node affinity scheduling rules for
|
description: Describes node affinity scheduling rules for
|
||||||
@@ -4304,11 +4304,15 @@ spec:
|
|||||||
type: array
|
type: array
|
||||||
type: object
|
type: object
|
||||||
replicas:
|
replicas:
|
||||||
default: 1
|
default: 2
|
||||||
description: |-
|
description: |-
|
||||||
replicas. terdut-server is not horizontally-scale-tested; keep this
|
replicas. Defaults to 2: terdut-server v0.36.0 put the sweeper, the
|
||||||
at its default of 1 unless you've verified otherwise -- the sweeper
|
notifier and the migration runner each behind a Postgres advisory
|
||||||
and the notifier are unsynchronised singletons.
|
lock, and gave incident creation its own conflict resolution, so
|
||||||
|
more than one replica no longer double-pages, races a migration, or
|
||||||
|
drops a webhook payload. image.tag must be v0.36.0 or newer for
|
||||||
|
that to hold -- an older terdut-server has none of these guards,
|
||||||
|
and this field does not check the tag for you.
|
||||||
format: int32
|
format: int32
|
||||||
type: integer
|
type: integer
|
||||||
sweeper:
|
sweeper:
|
||||||
|
|||||||
@@ -233,7 +233,11 @@ terdutServer:
|
|||||||
## Required when terdutServer.enabled.
|
## Required when terdutServer.enabled.
|
||||||
# tag: ""
|
# tag: ""
|
||||||
|
|
||||||
replicas: 1
|
## Safe above 1 since terdut-server v0.36.0 (image.tag above must be that or
|
||||||
|
## newer): the sweeper, notifier and migration runner are each behind a
|
||||||
|
## Postgres advisory lock, and incident creation resolves its own insert
|
||||||
|
## conflict, matching this CRD's own spec.replicas default.
|
||||||
|
replicas: 2
|
||||||
|
|
||||||
networking:
|
networking:
|
||||||
## Required when terdutServer.enabled -- terdut-server's own public
|
## Required when terdutServer.enabled -- terdut-server's own public
|
||||||
|
|||||||
@@ -324,11 +324,11 @@ spec:
|
|||||||
affinity:
|
affinity:
|
||||||
description: |-
|
description: |-
|
||||||
affinity covers node affinity, pod affinity and pod anti-affinity in
|
affinity covers node affinity, pod affinity and pod anti-affinity in
|
||||||
one field -- unlike a multi-replica-aware operator, this one never
|
one field -- even though replicas now defaults to 2 (see
|
||||||
generates a default anti-affinity itself (replicas above 1 isn't a
|
TerdutServerSpec.Replicas's own doc comment), this operator still
|
||||||
supported topology, see TerdutServerSpec.Replicas's own doc comment),
|
never generates a default anti-affinity of its own the way a
|
||||||
so this is pure user-supplied passthrough, not a toggle-plus-generated-
|
multi-replica-aware operator typically would, so this stays pure
|
||||||
default.
|
user-supplied passthrough, not a toggle-plus-generated-default.
|
||||||
properties:
|
properties:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
description: Describes node affinity scheduling rules for
|
description: Describes node affinity scheduling rules for
|
||||||
@@ -4301,11 +4301,15 @@ spec:
|
|||||||
type: array
|
type: array
|
||||||
type: object
|
type: object
|
||||||
replicas:
|
replicas:
|
||||||
default: 1
|
default: 2
|
||||||
description: |-
|
description: |-
|
||||||
replicas. terdut-server is not horizontally-scale-tested; keep this
|
replicas. Defaults to 2: terdut-server v0.36.0 put the sweeper, the
|
||||||
at its default of 1 unless you've verified otherwise -- the sweeper
|
notifier and the migration runner each behind a Postgres advisory
|
||||||
and the notifier are unsynchronised singletons.
|
lock, and gave incident creation its own conflict resolution, so
|
||||||
|
more than one replica no longer double-pages, races a migration, or
|
||||||
|
drops a webhook payload. image.tag must be v0.36.0 or newer for
|
||||||
|
that to hold -- an older terdut-server has none of these guards,
|
||||||
|
and this field does not check the tag for you.
|
||||||
format: int32
|
format: int32
|
||||||
type: integer
|
type: integer
|
||||||
sweeper:
|
sweeper:
|
||||||
|
|||||||
@@ -37,17 +37,27 @@ func (r *TerdutServerReconciler) reconcileDeployment(
|
|||||||
_, err := controllerutil.CreateOrUpdate(ctx, r.Client, deploy, func() error {
|
_, err := controllerutil.CreateOrUpdate(ctx, r.Client, deploy, func() error {
|
||||||
replicas := srv.Spec.Replicas
|
replicas := srv.Spec.Replicas
|
||||||
if replicas == 0 {
|
if replicas == 0 {
|
||||||
replicas = 1
|
// Only reachable for a TerdutServer stored before the
|
||||||
|
// +kubebuilder:default=2 marker existed -- the API server's own
|
||||||
|
// CRD defaulting fills this in for anything created or updated
|
||||||
|
// through it, so a fresh zero value here means a pre-existing
|
||||||
|
// object that predates the default, not a deliberate "none"
|
||||||
|
// (there is no way to request zero replicas).
|
||||||
|
replicas = 2
|
||||||
}
|
}
|
||||||
labels := labelsFor(srv)
|
labels := labelsFor(srv)
|
||||||
|
|
||||||
deploy.Spec.Replicas = &replicas
|
deploy.Spec.Replicas = &replicas
|
||||||
deploy.Spec.Selector = &metav1.LabelSelector{MatchLabels: labels}
|
deploy.Spec.Selector = &metav1.LabelSelector{MatchLabels: labels}
|
||||||
// Recreate, not RollingUpdate: the sweeper and the notifier are
|
// RollingUpdate, not Recreate: terdut-server v0.36.0 put the sweeper,
|
||||||
// unsynchronised singletons inside terdut-server, and two replicas
|
// the notifier and the migration runner each behind a Postgres
|
||||||
// overlapping during a rollout would both page for the same
|
// advisory lock, and gave incident creation its own conflict
|
||||||
// incident (matches the chart's own deployment.yaml comment).
|
// resolution, so two replicas overlapping during a rollout no longer
|
||||||
deploy.Spec.Strategy = appsv1.DeploymentStrategy{Type: appsv1.RecreateDeploymentStrategyType}
|
// double-page, race a migration, or drop a webhook payload (matches
|
||||||
|
// the chart's own deployment.yaml comment). No explicit
|
||||||
|
// maxUnavailable/maxSurge: left at the 25%/25% default, which rounds
|
||||||
|
// to 0/1 at the default replicas: 2 -- already zero-downtime.
|
||||||
|
deploy.Spec.Strategy = appsv1.DeploymentStrategy{Type: appsv1.RollingUpdateDeploymentStrategyType}
|
||||||
pod := srv.Spec.Pod
|
pod := srv.Spec.Pod
|
||||||
deploy.Spec.Template = corev1.PodTemplateSpec{
|
deploy.Spec.Template = corev1.PodTemplateSpec{
|
||||||
// pod.Annotations is assigned directly, not merged -- nothing
|
// pod.Annotations is assigned directly, not merged -- nothing
|
||||||
|
|||||||
Reference in New Issue
Block a user