github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent infinite loop

Browse Source
This commit is contained in:
mathetake
2020-02-25 18:14:43 +09:00
parent 4fe19be9b7
commit eec343f3aa
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/canary/daemonset_controller.go
+17 -6
View File
@@ -46,6 +46,7 @@ func (c *DaemonSetController) Scale(cd *flaggerv1.Canary, v int32) error {
for k, v := range dae.Spec.Template.Spec.NodeSelector {
daeCopy.Spec.Template.Spec.NodeSelector[k] = v
}
for k, v := range daemonSetScaleDownNodeSelector {
daeCopy.Spec.Template.Spec.NodeSelector[k] = v
}
@@ -149,6 +150,11 @@ func (c *DaemonSetController) Promote(cd *flaggerv1.Canary) error {
// update spec with primary secrets and config maps
primaryCopy.Spec.Template.Spec = c.configTracker.ApplyPrimaryConfigs(canary.Spec.Template.Spec, configRefs)
// ignore `daemonSetScaleDownNodeSelector` node selector
for key := range daemonSetScaleDownNodeSelector {
delete(primaryCopy.Spec.Template.Spec.NodeSelector, key)
}
// update pod annotations to ensure a rolling update
annotations, err := makeAnnotations(canary.Spec.Template.Annotations)
if err != nil {
@@ -183,6 +189,11 @@ func (c *DaemonSetController) HasTargetChanged(cd *flaggerv1.Canary) (bool, erro
delete(canary.Spec.Template.Spec.NodeSelector, key)
}
// since nil and capacity zero map would have different hash, we have to initialize here
if canary.Spec.Template.Spec.NodeSelector == nil {
canary.Spec.Template.Spec.NodeSelector = map[string]string{}
}
return hasSpecChanged(cd, canary.Spec.Template)
}
@@ -234,12 +245,6 @@ func (c *DaemonSetController) createPrimaryDaemonSet(cd *flaggerv1.Canary) error
targetName, cd.Namespace, canaryDae.Spec.UpdateStrategy.Type)
}
if cd.GetProgressDeadlineSeconds() > 0 {
// (@mathetake): should we?
c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).
Infof("progressDeadlineSeconds is ignored for DaemonSet", cd.Spec.TargetRef.Name, cd.Namespace)
}
label, err := c.getSelectorLabel(canaryDae)
if err != nil {
return fmt.Errorf("invalid label selector! DaemonSet %s.%s spec.selector.matchLabels must contain selector 'app: %s'",
@@ -248,6 +253,12 @@ func (c *DaemonSetController) createPrimaryDaemonSet(cd *flaggerv1.Canary) error
primaryDep, err := c.kubeClient.AppsV1().DaemonSets(cd.Namespace).Get(primaryName, metav1.GetOptions{})
if errors.IsNotFound(err) {
if cd.GetProgressDeadlineSeconds() > 0 {
// (@mathetake): should we?
c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).
Infof("progressDeadlineSeconds is ignored for DaemonSet")
}
// create primary secrets and config maps
configRefs, err := c.configTracker.GetTargetConfigs(cd)
if err != nil {
pkg/canary/daemonset_status.go
+5
View File
@@ -24,6 +24,11 @@ func (c *DaemonSetController) SyncStatus(cd *flaggerv1.Canary, status flaggerv1.
delete(dae.Spec.Template.Spec.NodeSelector, key)
}
// since nil and capacity zero map would have different hash, we have to initialize here
if dae.Spec.Template.Spec.NodeSelector == nil {
dae.Spec.Template.Spec.NodeSelector = map[string]string{}
}
configs, err := c.configTracker.GetConfigRefs(cd)
if err != nil {
return ex.Wrap(err, "SyncStatus configs query error")