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

add DaemonSet targetKind in crd and change label selector

Browse Source 
and ignore daemonSetScaleDownNodeSelector in target spec change detection
This commit is contained in:
mathetake
2020-02-25 13:00:36 +09:00
parent 336344720c
commit cc07c2891e
7 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/canary/daemonset_controller.go
+7 -3
View File
@@ -16,7 +16,7 @@ import (
)
var (
daemonSetScaleDownNodeSelector = map[string]string{"flagger.weave.works/non-exist": "true"}
daemonSetScaleDownNodeSelector = map[string]string{"flagger.app/scale-to-zero": "true"}
)
// DaemonSetController is managing the operations for Kubernetes DaemonSet kind
@@ -97,8 +97,7 @@ func (c *DaemonSetController) Initialize(cd *flaggerv1.Canary, skipLivenessCheck
}
}
// delete canary daemonset
c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("Deleting %s.%s", cd.Spec.TargetRef.Name, cd.Namespace)
c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("Scaling down %s.%s", cd.Spec.TargetRef.Name, cd.Namespace)
if err := c.Scale(cd, 0); err != nil {
return err
}
@@ -179,6 +178,11 @@ func (c *DaemonSetController) HasTargetChanged(cd *flaggerv1.Canary) (bool, erro
return false, fmt.Errorf("daemonset %s.%s query error %v", targetName, cd.Namespace, err)
}
// ignore `daemonSetScaleDownNodeSelector` node selector
for key := range daemonSetScaleDownNodeSelector {
delete(canary.Spec.Template.Spec.NodeSelector, key)
}
return hasSpecChanged(cd, canary.Spec.Template)
}
pkg/canary/daemonset_status.go
+7 -2
View File
@@ -11,7 +11,7 @@ import (
// SyncStatus encodes the canary pod spec and updates the canary status
func (c *DaemonSetController) SyncStatus(cd *flaggerv1.Canary, status flaggerv1.CanaryStatus) error {
dep, err := c.kubeClient.AppsV1().DaemonSets(cd.Namespace).Get(cd.Spec.TargetRef.Name, metav1.GetOptions{})
dae, err := c.kubeClient.AppsV1().DaemonSets(cd.Namespace).Get(cd.Spec.TargetRef.Name, metav1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
return fmt.Errorf("daemonset %s.%s not found", cd.Spec.TargetRef.Name, cd.Namespace)
@@ -19,12 +19,17 @@ func (c *DaemonSetController) SyncStatus(cd *flaggerv1.Canary, status flaggerv1.
return ex.Wrap(err, "SyncStatus daemonset query error")
}
// ignore `daemonSetScaleDownNodeSelector` node selector
for key := range daemonSetScaleDownNodeSelector {
delete(dae.Spec.Template.Spec.NodeSelector, key)
}
configs, err := c.configTracker.GetConfigRefs(cd)
if err != nil {
return ex.Wrap(err, "SyncStatus configs query error")
}
return syncCanaryStatus(c.flaggerClient, cd, status, dep.Spec.Template, func(cdCopy *flaggerv1.Canary) {
return syncCanaryStatus(c.flaggerClient, cd, status, dae.Spec.Template, func(cdCopy *flaggerv1.Canary) {
cdCopy.Status.TrackedConfigs = configs
})
}