msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Rewording to match code reviews feedbacks and fix specs

Browse Source 
Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
pull/30698/head
Benoit Tigeot 6 months ago
parent ef03e2bd7b
commit 28305b5f3c
No known key found for this signature in database
GPG Key ID: 8E6D4FC8AEBDA62C
4 changed files with 30 additions and 75 deletions
Show Stats Download Patch File Download Diff File

39
pkg/kube/client.go
Unescape View File

@ -340,45 +340,6 @@ func getResource(info *resource.Info) (runtime.Object, error) {
return obj, nil return obj, nil
} }
// Wait waits up to the given timeout for the specified resources to be ready.
func (c *Client) Wait(resources ResourceList, timeout time.Duration) error {
cs, err := c.getKubeClient()
if err != nil {
return err
}
checker := NewReadyChecker(cs, PausedAsReady(true))
w := waiter{
c: checker,
log: c.Log,
timeout: timeout,
}
return w.waitForResources(resources)
}
// WaitWithJobs wait up to the given timeout for the specified resources to be ready, including jobs.
func (c *Client) WaitWithJobs(resources ResourceList, timeout time.Duration) error {
cs, err := c.getKubeClient()
if err != nil {
return err
}
checker := NewReadyChecker(cs, PausedAsReady(true), CheckJobs(true))
w := waiter{
c: checker,
log: c.Log,
timeout: timeout,
}
return w.waitForResources(resources)
}
// WaitForDelete wait up to the given timeout for the specified resources to be deleted.
func (c *Client) WaitForDelete(resources ResourceList, timeout time.Duration) error {
w := waiter{
log: c.Log,
timeout: timeout,
}
return w.waitForDeletedResources(resources)
}
func (c *Client) namespace() string { func (c *Client) namespace() string {
if c.Namespace != "" { if c.Namespace != "" {
return c.Namespace return c.Namespace

56
pkg/kube/ready.go
Unescape View File

@ -287,17 +287,17 @@ func (c *ReadyChecker) deploymentReady(rs *appsv1.ReplicaSet, dep *appsv1.Deploy
} }
// Verify the generation observed by the deployment controller matches the spec generation // Verify the generation observed by the deployment controller matches the spec generation
if dep.Status.ObservedGeneration != dep.ObjectMeta.Generation { if dep.Status.ObservedGeneration != dep.ObjectMeta.Generation {
slog.Debug("Deployment is not ready: observedGeneration does not match spec generation", slog.Debug("Deployment generation does not match spec",
"namespace", dep.Namespace, "namespace", dep.Namespace,
"name", dep.Name, "name", dep.Name,
"observedGeneration", dep.Status.ObservedGeneration, "actualGeneration", dep.Status.ObservedGeneration,
"specGeneration", dep.ObjectMeta.Generation) "expectedGeneration", dep.ObjectMeta.Generation)
return false return false
} }
expectedReady := *dep.Spec.Replicas - deploymentutil.MaxUnavailable(*dep) expectedReady := *dep.Spec.Replicas - deploymentutil.MaxUnavailable(*dep)
if !(rs.Status.ReadyReplicas >= expectedReady) { if !(rs.Status.ReadyReplicas >= expectedReady) {
slog.Debug("Deployment is not ready: not enough pods ready", slog.Debug("Deployment does not have enough pods ready",
"namespace", dep.Namespace, "namespace", dep.Namespace,
"name", dep.Name, "name", dep.Name,
"readyReplicas", rs.Status.ReadyReplicas, "readyReplicas", rs.Status.ReadyReplicas,
@ -310,11 +310,11 @@ func (c *ReadyChecker) deploymentReady(rs *appsv1.ReplicaSet, dep *appsv1.Deploy
func (c *ReadyChecker) daemonSetReady(ds *appsv1.DaemonSet) bool { func (c *ReadyChecker) daemonSetReady(ds *appsv1.DaemonSet) bool {
// Verify the generation observed by the daemonSet controller matches the spec generation // Verify the generation observed by the daemonSet controller matches the spec generation
if ds.Status.ObservedGeneration != ds.ObjectMeta.Generation { if ds.Status.ObservedGeneration != ds.ObjectMeta.Generation {
slog.Debug("DaemonSet is not ready: observedGeneration does not match spec generation", slog.Debug("DaemonSet generation does not match spec",
"namespace", ds.Namespace, "namespace", ds.Namespace,
"name", ds.Name, "name", ds.Name,
"observedGeneration", ds.Status.ObservedGeneration, "actualGeneration", ds.Status.ObservedGeneration,
"specGeneration", ds.ObjectMeta.Generation) "expectedReplicas", ds.ObjectMeta.Generation)
return false return false
} }
@ -325,11 +325,11 @@ func (c *ReadyChecker) daemonSetReady(ds *appsv1.DaemonSet) bool {
// Make sure all the updated pods have been scheduled // Make sure all the updated pods have been scheduled
if ds.Status.UpdatedNumberScheduled != ds.Status.DesiredNumberScheduled { if ds.Status.UpdatedNumberScheduled != ds.Status.DesiredNumberScheduled {
slog.Debug("DaemonSet is not ready: not enough pods scheduled", slog.Debug("DaemonSet does not have enough pods scheduled",
"namespace", ds.Namespace, "namespace", ds.Namespace,
"name", ds.Name, "name", ds.Name,
"updatedScheduled", ds.Status.UpdatedNumberScheduled, "updatedScheduled", ds.Status.UpdatedNumberScheduled,
"desiredScheduled", ds.Status.DesiredNumberScheduled) "expectedScheduled", ds.Status.DesiredNumberScheduled)
return false return false
} }
maxUnavailable, err := intstr.GetScaledValueFromIntOrPercent(ds.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable, int(ds.Status.DesiredNumberScheduled), true) maxUnavailable, err := intstr.GetScaledValueFromIntOrPercent(ds.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable, int(ds.Status.DesiredNumberScheduled), true)
@ -342,7 +342,7 @@ func (c *ReadyChecker) daemonSetReady(ds *appsv1.DaemonSet) bool {
expectedReady := int(ds.Status.DesiredNumberScheduled) - maxUnavailable expectedReady := int(ds.Status.DesiredNumberScheduled) - maxUnavailable
if !(int(ds.Status.NumberReady) >= expectedReady) { if !(int(ds.Status.NumberReady) >= expectedReady) {
slog.Debug("DaemonSet is not ready: not enough pods ready", slog.Debug("DaemonSet does not have enough pods ready",
"namespace", ds.Namespace, "namespace", ds.Namespace,
"name", ds.Name, "name", ds.Name,
"readyPods", ds.Status.NumberReady, "readyPods", ds.Status.NumberReady,
@ -398,11 +398,11 @@ func (c *ReadyChecker) crdReady(crd apiextv1.CustomResourceDefinition) bool {
func (c *ReadyChecker) statefulSetReady(sts *appsv1.StatefulSet) bool { func (c *ReadyChecker) statefulSetReady(sts *appsv1.StatefulSet) bool {
// Verify the generation observed by the statefulSet controller matches the spec generation // Verify the generation observed by the statefulSet controller matches the spec generation
if sts.Status.ObservedGeneration != sts.ObjectMeta.Generation { if sts.Status.ObservedGeneration != sts.ObjectMeta.Generation {
slog.Debug("StatefulSet is not ready: observedGeneration does not match spec generation", slog.Debug("StatefulSet does not match spec generation",
"namespace", sts.Namespace, "namespace", sts.Namespace,
"name", sts.Name, "name", sts.Name,
"observedGeneration", sts.Status.ObservedGeneration, "actualGeneration", sts.Status.ObservedGeneration,
"specGeneration", sts.ObjectMeta.Generation) "expectedGeneration", sts.ObjectMeta.Generation)
return false return false
} }
@ -437,35 +437,35 @@ func (c *ReadyChecker) statefulSetReady(sts *appsv1.StatefulSet) bool {
// Make sure all the updated pods have been scheduled // Make sure all the updated pods have been scheduled
if int(sts.Status.UpdatedReplicas) < expectedReplicas { if int(sts.Status.UpdatedReplicas) < expectedReplicas {
slog.Debug("StatefulSet is not ready: not enough pods scheduled", slog.Debug("StatefulSet does not have enough pods scheduled",
"namespace", sts.Namespace, "namespace", sts.Namespace,
"name", sts.Name, "name", sts.Name,
"updatedReplicas", sts.Status.UpdatedReplicas, "updatedScheduled", sts.Status.UpdatedReplicas,
"expectedReplicas", expectedReplicas) "expectedScheduled", expectedReplicas)
return false return false
} }
if int(sts.Status.ReadyReplicas) != replicas { if int(sts.Status.ReadyReplicas) != replicas {
slog.Debug("StatefulSet is not ready: not enough pods ready", slog.Debug("StatefulSet does not have enough pods ready",
"namespace", sts.Namespace, "namespace", sts.Namespace,
"name", sts.Name, "name", sts.Name,
"readyReplicas", sts.Status.ReadyReplicas, "readyPods", sts.Status.ReadyReplicas,
"expectedReplicas", replicas) "expectedPods", replicas)
return false return false
} }
// This check only makes sense when all partitions are being upgraded otherwise during a // This check only makes sense when all partitions are being upgraded otherwise during a
// partitioned rolling upgrade, this condition will never evaluate to true, leading to // partitioned rolling upgrade, this condition will never evaluate to true, leading to
// error. // error.
if partition == 0 && sts.Status.CurrentRevision != sts.Status.UpdateRevision { if partition == 0 && sts.Status.CurrentRevision != sts.Status.UpdateRevision {
slog.Debug("StatefulSet is not ready: currentRevision does not match updateRevision", slog.Debug("StatefulSet does not have the expected revision",
"namespace", sts.Namespace, "namespace", sts.Namespace,
"name", sts.Name, "name", sts.Name,
"currentRevision", sts.Status.CurrentRevision, "currentRevision", sts.Status.CurrentRevision,
"updateRevision", sts.Status.UpdateRevision) "expectedRevision", sts.Status.UpdateRevision)
return false return false
} }
slog.Debug("StatefulSet is ready", slog.Debug("StatefulSet does not have enough pods ready",
"namespace", sts.Namespace, "namespace", sts.Namespace,
"name", sts.Name, "name", sts.Name,
"readyReplicas", sts.Status.ReadyReplicas, "readyReplicas", sts.Status.ReadyReplicas,
@ -476,11 +476,11 @@ func (c *ReadyChecker) statefulSetReady(sts *appsv1.StatefulSet) bool {
func (c *ReadyChecker) replicationControllerReady(rc *corev1.ReplicationController) bool { func (c *ReadyChecker) replicationControllerReady(rc *corev1.ReplicationController) bool {
// Verify the generation observed by the replicationController controller matches the spec generation // Verify the generation observed by the replicationController controller matches the spec generation
if rc.Status.ObservedGeneration != rc.ObjectMeta.Generation { if rc.Status.ObservedGeneration != rc.ObjectMeta.Generation {
slog.Debug("ReplicationController is not ready: observedGeneration does not match spec generation", slog.Debug("ReplicationController does not match spec generation",
"namespace", rc.Namespace, "namespace", rc.Namespace,
"name", rc.Name, "name", rc.Name,
"observedGeneration", rc.Status.ObservedGeneration, "actualGeneration", rc.Status.ObservedGeneration,
"specGeneration", rc.ObjectMeta.Generation) "expectedGeneration", rc.ObjectMeta.Generation)
return false return false
} }
return true return true
@ -489,11 +489,11 @@ func (c *ReadyChecker) replicationControllerReady(rc *corev1.ReplicationControll
func (c *ReadyChecker) replicaSetReady(rs *appsv1.ReplicaSet) bool { func (c *ReadyChecker) replicaSetReady(rs *appsv1.ReplicaSet) bool {
// Verify the generation observed by the replicaSet controller matches the spec generation // Verify the generation observed by the replicaSet controller matches the spec generation
if rs.Status.ObservedGeneration != rs.ObjectMeta.Generation { if rs.Status.ObservedGeneration != rs.ObjectMeta.Generation {
slog.Debug("ReplicaSet is not ready: observedGeneration does not match spec generation", slog.Debug("ReplicaSet does not match spec generation",
"namespace", rs.Namespace, "namespace", rs.Namespace,
"name", rs.Name, "name", rs.Name,
"observedGeneration", rs.Status.ObservedGeneration, "actualGeneration", rs.Status.ObservedGeneration,
"specGeneration", rs.ObjectMeta.Generation) "expectedGeneration", rs.ObjectMeta.Generation)
return false return false
} }
return true return true

6
pkg/kube/ready_test.go
Unescape View File

@ -56,7 +56,6 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) {
name: "IsReady Pod", name: "IsReady Pod",
fields: fields{ fields: fields{
client: fake.NewSimpleClientset(), client: fake.NewSimpleClientset(),
log: func(string, ...interface{}) {},
checkJobs: true, checkJobs: true,
pausedAsReady: false, pausedAsReady: false,
}, },
@ -72,7 +71,6 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) {
name: "IsReady Pod returns error", name: "IsReady Pod returns error",
fields: fields{ fields: fields{
client: fake.NewSimpleClientset(), client: fake.NewSimpleClientset(),
log: func(string, ...interface{}) {},
checkJobs: true, checkJobs: true,
pausedAsReady: false, pausedAsReady: false,
}, },
@ -130,7 +128,6 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) {
name: "IsReady Job error while getting job", name: "IsReady Job error while getting job",
fields: fields{ fields: fields{
client: fake.NewSimpleClientset(), client: fake.NewSimpleClientset(),
log: func(string, ...interface{}) {},
checkJobs: true, checkJobs: true,
pausedAsReady: false, pausedAsReady: false,
}, },
@ -146,7 +143,6 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) {
name: "IsReady Job", name: "IsReady Job",
fields: fields{ fields: fields{
client: fake.NewSimpleClientset(), client: fake.NewSimpleClientset(),
log: func(string, ...interface{}) {},
checkJobs: true, checkJobs: true,
pausedAsReady: false, pausedAsReady: false,
}, },
@ -204,7 +200,6 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) {
name: "IsReady Deployments error while getting current Deployment", name: "IsReady Deployments error while getting current Deployment",
fields: fields{ fields: fields{
client: fake.NewSimpleClientset(), client: fake.NewSimpleClientset(),
log: func(string, ...interface{}) {},
checkJobs: true, checkJobs: true,
pausedAsReady: false, pausedAsReady: false,
}, },
@ -221,7 +216,6 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) {
name: "IsReady Deployments", //TODO fix this one name: "IsReady Deployments", //TODO fix this one
fields: fields{ fields: fields{
client: fake.NewSimpleClientset(), client: fake.NewSimpleClientset(),
log: func(string, ...interface{}) {},
checkJobs: true, checkJobs: true,
pausedAsReady: false, pausedAsReady: false,
}, },

4
pkg/kube/wait.go
Unescape View File

@ -55,12 +55,12 @@ type legacyWaiter struct {
} }
func (hw *legacyWaiter) Wait(resources ResourceList, timeout time.Duration) error { func (hw *legacyWaiter) Wait(resources ResourceList, timeout time.Duration) error {
hw.c = NewReadyChecker(hw.kubeClient, hw.log, PausedAsReady(true)) hw.c = NewReadyChecker(hw.kubeClient, PausedAsReady(true))
return hw.waitForResources(resources, timeout) return hw.waitForResources(resources, timeout)
} }
func (hw *legacyWaiter) WaitWithJobs(resources ResourceList, timeout time.Duration) error { func (hw *legacyWaiter) WaitWithJobs(resources ResourceList, timeout time.Duration) error {
hw.c = NewReadyChecker(hw.kubeClient, hw.log, PausedAsReady(true), CheckJobs(true)) hw.c = NewReadyChecker(hw.kubeClient, PausedAsReady(true), CheckJobs(true))
return hw.waitForResources(resources, timeout) return hw.waitForResources(resources, timeout)
} }

Write Preview
Loading…
Cancel
Save