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

Jump to bottom

status: detect when DaemonSets and Deployments are rolling out #1383

Merged
merged 1 commit into from Feb 21, 2023
Merged

status: detect when DaemonSets and Deployments are rolling out #1383

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions status/k8s.go
View file
Open in desktop
Expand Up @@ -168,6 +168,16 @@ func (k *K8sStatusCollector) deploymentStatus(ctx context.Context, status *Statu
status.AddAggregatedWarning(name, name, fmt.Errorf("%d pods of Deployment %s are not available", unavailable, name))
}

// ObservedGeneration behind: DeploymentController has not yet noticed the latest change
if d.Generation != d.Status.ObservedGeneration {
status.AddAggregatedError(name, name, fmt.Errorf("deployment %s is updated but rollout has not started", name))
}

// Deployment change is not fully rolled out
if d.Status.UpdatedReplicas < d.Status.Replicas {
status.AddAggregatedError(name, name, fmt.Errorf("deployment %s is rolling out - %d out of %d pods updated", name, d.Status.UpdatedReplicas, d.Status.Replicas))
}

return false, nil
}

Expand Down Expand Up @@ -233,6 +243,16 @@ func (k *K8sStatusCollector) daemonSetStatus(ctx context.Context, status *Status
status.AddAggregatedWarning(name, name, fmt.Errorf("%d pods of DaemonSet %s are not available", unavailable, name))
}

// ObservedGeneration behind: DaemonSetController has not yet noticed the latest change
if daemonSet.Generation != daemonSet.Status.ObservedGeneration {
status.AddAggregatedError(name, name, fmt.Errorf("daemonset %s is updated but rollout has not started", name))
}

// DaemonSet change is not fully rolled out
if daemonSet.Status.UpdatedNumberScheduled < daemonSet.Status.DesiredNumberScheduled {
status.AddAggregatedError(name, name, fmt.Errorf("daemonset %s is rolling out - %d out of %d pods updated", name, daemonSet.Status.UpdatedNumberScheduled, daemonSet.Status.DesiredNumberScheduled))
}

return nil
}

Expand Down
33 changes: 26 additions & 7 deletions status/k8s_test.go
View file
Open in desktop
Expand Up @@ -73,19 +73,22 @@ func (c *k8sStatusMockClient) addPod(namespace, name, filter string, containers
})
}

func (c *k8sStatusMockClient) setDaemonSet(namespace, name, filter string, desired, ready, available, unavailable int32) {
func (c *k8sStatusMockClient) setDaemonSet(namespace, name, filter string, desired, ready, available, unavailable, updated int32, generation, obvsGeneration int64) {
c.daemonSet = map[string]*appsv1.DaemonSet{}

c.daemonSet[namespace+"/"+name] = &appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Name: name,
Namespace: namespace,
Generation: generation,
},
Status: appsv1.DaemonSetStatus{
DesiredNumberScheduled: desired,
NumberReady: ready,
NumberAvailable: available,
NumberUnavailable: unavailable,
UpdatedNumberScheduled: updated,
ObservedGeneration: obvsGeneration,
},
}

Expand Down Expand Up @@ -166,7 +169,7 @@ func (b *StatusSuite) TestStatus(c *check.C) {
c.Assert(err, check.IsNil)
c.Assert(collector, check.Not(check.IsNil))

client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 10, 10, 0)
client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 10, 10, 0, 10, 1, 1)
status, err := collector.Status(context.Background())
c.Assert(err, check.IsNil)
c.Assert(status, check.Not(check.IsNil))
Expand All @@ -179,7 +182,7 @@ func (b *StatusSuite) TestStatus(c *check.C) {
c.Assert(len(status.CiliumStatus), check.Equals, 10)

client.reset()
client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 5, 5, 5)
client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 5, 5, 5, 10, 2, 2)
status, err = collector.Status(context.Background())
c.Assert(err, check.IsNil)
c.Assert(status, check.Not(check.IsNil))
Expand All @@ -192,7 +195,7 @@ func (b *StatusSuite) TestStatus(c *check.C) {
c.Assert(len(status.CiliumStatus), check.Equals, 5)

client.reset()
client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 5, 5, 5)
client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 5, 5, 5, 10, 3, 3)
delete(client.status, "cilium-2")
status, err = collector.Status(context.Background())
c.Assert(err, check.IsNil)
Expand All @@ -205,6 +208,22 @@ func (b *StatusSuite) TestStatus(c *check.C) {
c.Assert(status.PhaseCount[defaults.AgentDaemonSetName][string(corev1.PodFailed)], check.Equals, 5)
c.Assert(len(status.CiliumStatus), check.Equals, 5)
c.Assert(status.CiliumStatus["cilium-2"], check.IsNil)

client.reset()
// observed generation behind
client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 5, 5, 5, 5, 5, 3, 2)
status, err = collector.Status(context.Background())
c.Assert(err, check.IsNil)
c.Assert(status, check.Not(check.IsNil))
c.Assert(status.Errors["cilium"]["cilium"].Errors, check.HasLen, 1)
c.Assert(status.Errors["cilium"]["cilium"].Errors[0], check.ErrorMatches, ".*rollout has not started.*")

client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 5, 5, 5, 5, 1, 3, 3)
status, err = collector.Status(context.Background())
c.Assert(err, check.IsNil)
c.Assert(status, check.Not(check.IsNil))
c.Assert(status.Errors["cilium"]["cilium"].Errors, check.HasLen, 1)
c.Assert(status.Errors["cilium"]["cilium"].Errors[0], check.ErrorMatches, ".*is rolling out.*")
}

func (b *StatusSuite) TestFormat(c *check.C) {
Expand All @@ -215,7 +234,7 @@ func (b *StatusSuite) TestFormat(c *check.C) {
c.Assert(err, check.IsNil)
c.Assert(collector, check.Not(check.IsNil))

client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 5, 5, 5)
client.setDaemonSet("kube-system", defaults.AgentDaemonSetName, defaults.AgentPodSelector, 10, 5, 5, 5, 10, 4, 4)
delete(client.status, "cilium-2")

client.addPod("kube-system", "cilium-operator-1", "k8s-app=cilium-operator", []corev1.Container{{Image: "cilium-operator:1.9"}}, corev1.PodStatus{Phase: corev1.PodRunning})
Expand Down