Skip to content

Commit

Permalink
checkpointer: ignore Affinity within podspec
Browse files Browse the repository at this point in the history
Kubernetes 1.12.x introduced new logic for Affinity [1]. In addition to
new logic, the Pod contains a default affinity. The new default affinity
gets serialized into the checkpoint file, and the 1.12.x kubelet does
not restore the pod due to the affinity.

This PR removes the affinity from the spec and documents that affinity's
are not supported.

```
"affinity": {
      "nodeAffinity": {
        "requiredDuringSchedulingIgnoredDuringExecution": {
          "nodeSelectorTerms": [
            {
              "matchExpressions": null
            }
          ]
        }
      }
    },

```

[1] kubernetes/kubernetes#68173
[2] https://github.com/kubernetes/kubernetes/blob/e39b510726113581c6f6a9c2db1753d794aa9cce/pkg/controller/daemon/util/daemonset_util.go#L183-L196
  • Loading branch information
rphillips committed Oct 11, 2018
1 parent 7fef233 commit 966008d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/checkpoint/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This is accomplished by managing checkpoints as static pod manifests:
## Use

Any pod which contains the `checkpointer.alpha.coreos.com/checkpoint=true` annotation will be considered a viable "parent pod" which should be checkpointed.
The parent pod cannot itself be a static pod, and is not a checkpoint itself.
The parent pod cannot itself be a static pod, and is not a checkpoint itself. Affinity is not supported for a pod, and any pod labelled with the checkpoint annotation will be checkpointed.

Checkpoints are denoted by the `checkpointer.alpha.coreos.com/checkpoint-of` annotation. This annotation will point to the parent of this checkpoint by pod name.

Expand Down
3 changes: 3 additions & 0 deletions pkg/checkpoint/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ func sanitizeCheckpointPod(cp *v1.Pod) *v1.Pod {
cp.Spec.ServiceAccountName = ""
cp.Spec.DeprecatedServiceAccount = ""

// Remove affinity
cp.Spec.Affinity = nil

// Sanitize the volumes
for i := range cp.Spec.Volumes {
v := &cp.Spec.Volumes[i]
Expand Down

0 comments on commit 966008d

Please sign in to comment.