default automatic updates to be every 4 hours (#606)

replicatedhq · May 28, 2020 · 7f96012 · 7f96012
1 parent d0b4625
commit 7f96012
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/kotsadm/migrations/tables/app.yaml b/kotsadm/migrations/tables/app.yaml
@@ -72,4 +72,4 @@ spec:
         type: text
       - name: update_checker_spec
         type: text
-        default: '@daily'
+        default: '@default'
diff --git a/kotsadm/pkg/handlers/update_checker_spec.go b/kotsadm/pkg/handlers/update_checker_spec.go
@@ -72,7 +72,7 @@ func UpdateCheckerSpec(w http.ResponseWriter, r *http.Request) {
 
 	// validate cron spec
 	cronSpec := updateCheckerSpecRequest.UpdateCheckerSpec
-	if cronSpec != "@never" {
+	if cronSpec != "@never" && cronSpec != "@default" {
 		_, err := cron.ParseStandard(cronSpec)
 		if err != nil {
 			logger.Error(err)

diff --git a/kotsadm/pkg/updatechecker/updatechecker.go b/kotsadm/pkg/updatechecker/updatechecker.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/kots/kotsadm/pkg/app"
@@ -66,11 +67,21 @@ func Configure(appID string) error {
 	mtx.Lock()
 	defer mtx.Unlock()
 
-	if a.UpdateCheckerSpec == "@never" || a.UpdateCheckerSpec == "" {
+	cronSpec := a.UpdateCheckerSpec
+
+	if cronSpec == "@never" || cronSpec == "" {
 		Stop(a.ID)
 		return nil
 	}
 
+	if cronSpec == "@default" {
+		// check for updates every 4 hours
+		t := time.Now()
+		m := t.Minute()
+		h := t.Hour() % 4
+		cronSpec = fmt.Sprintf("%d %d/4 * * *", m, h)
+	}
+
 	job, ok := jobs[a.ID]
 	if ok {
 		// job already exists, remove entries
@@ -85,7 +96,7 @@ func Configure(appID string) error {
 		))
 	}
 
-	_, err = job.AddFunc(a.UpdateCheckerSpec, func() {
+	_, err = job.AddFunc(cronSpec, func() {
 		logger.Debug("checking updates for app", zap.String("slug", a.Slug))
 
 		availableUpdates, err := CheckForUpdates(a)

diff --git a/kotsadm/web/src/components/modals/UpdateCheckerModal.jsx b/kotsadm/web/src/components/modals/UpdateCheckerModal.jsx
@@ -17,10 +17,14 @@ const SCHEDULES = [
     value: "@weekly",
     label: "Weekly",
   },
+  {
+    value: "@default",
+    label: "Default",
+  },
   {
     value: "custom",
     label: "Custom",
-  }
+  },
 ];
 
 export default class UpdateCheckerModal extends React.Component {
@@ -97,7 +101,7 @@ export default class UpdateCheckerModal extends React.Component {
 
   handleScheduleChange = selectedSchedule => {
     let updateCheckerSpec;
-    if (selectedSchedule.value != "custom") {
+    if (selectedSchedule.value !== "custom") {
       updateCheckerSpec = selectedSchedule.value;
     } else {
       updateCheckerSpec = "0 2 * * WED,SAT"; // arbitrary choice
@@ -160,9 +164,20 @@ export default class UpdateCheckerModal extends React.Component {
                   className="Input u-marginBottom--5"
                   placeholder="0 0 * * MON"
                   value={updateCheckerSpec}
-                  onChange={(e) => this.setState({ updateCheckerSpec: e.target.value })}
+                  onChange={(e) => {
+                    const schedule = find(SCHEDULES, { value: e.target.value });
+                    const selectedSchedule = schedule ? schedule : find(SCHEDULES, { value: "custom" });
+                    this.setState({ updateCheckerSpec: e.target.value, selectedSchedule });
+                  }}
                 />
-                {humanReadableCron && <span className="u-fontSize--small u-fontWeight--medium u-color--dustyGray">{humanReadableCron}</span>}
+                {selectedSchedule.value === "@default" ?
+                  <span className="u-fontSize--small u-fontWeight--medium u-color--dustyGray">Every 4 hours</span>
+                  :
+                  humanReadableCron ?
+                    <span className="u-fontSize--small u-fontWeight--medium u-color--dustyGray">{humanReadableCron}</span>
+                    :
+                    null
+                }
               </div>
             </div>
             {submitUpdateCheckerSpecErr && <span className="u-color--chestnut u-fontSize--small u-fontWeight--bold u-marginTop--15">Error: {submitUpdateCheckerSpecErr}</span>}