Skip to content

Commit

Permalink
Permit deployment/sts rollout even if there are no running replicas (#67
Browse files Browse the repository at this point in the history
)

* Permit deployment/sts rollout even if there are no running replicas

* Tagging version 0.7.6-beta1
  • Loading branch information
digiserg authored Jun 28, 2023
1 parent e81ce54 commit 72d7ca3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
4 changes: 2 additions & 2 deletions charts/vals-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ kubeVersion: ">= 1.19.0-0"
type: application

# Chart version
version: 0.7.5
version: 0.7.6-beta1

# Latest container tag
appVersion: v0.7.5
appVersion: v0.7.6-beta1

maintainers:
- email: info@digitalis.io
Expand Down
20 changes: 8 additions & 12 deletions controllers/dbsecret_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -488,12 +488,10 @@ func (r *DbSecretReconciler) rollout(sDef *digitalisiov1beta1.DbSecret, rolloutT
return err
}

if object.Status.ReadyReplicas > 0 {
object.Spec.Template.Annotations[restartedAnnotation] = time.Now().UTC().Format(timeLayout)
err = r.Update(r.Ctx, &object)
if err != nil {
return err
}
object.Spec.Template.Annotations[restartedAnnotation] = time.Now().UTC().Format(timeLayout)
err = r.Update(r.Ctx, &object)
if err != nil {
return err
}
} else if strings.ToLower(rolloutTarget.Kind) == "statefulset" {
var object v1.StatefulSet
Expand All @@ -506,12 +504,10 @@ func (r *DbSecretReconciler) rollout(sDef *digitalisiov1beta1.DbSecret, rolloutT
return err
}

if object.Status.ReadyReplicas > 0 {
object.Spec.Template.Annotations[restartedAnnotation] = time.Now().UTC().Format(timeLayout)
err = r.Update(r.Ctx, &object)
if err != nil {
return err
}
object.Spec.Template.Annotations[restartedAnnotation] = time.Now().UTC().Format(timeLayout)
err = r.Update(r.Ctx, &object)
if err != nil {
return err
}
} else {
return fmt.Errorf("%s kind is not supported", rolloutTarget.Kind)
Expand Down

0 comments on commit 72d7ca3

Please sign in to comment.