Merge branch 'branch/v15' into mcbattirola/v15/update-proxy-features

gravitational · Oct 31, 2024 · b89f5f9 · b89f5f9
2 parents e416820 + 8948c2c
commit b89f5f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/docs/config.json b/docs/config.json
@@ -134,7 +134,7 @@
       "aws_secret_access_key": "zyxw9876-this-is-an-example"
     },
     "cloud": {
-      "version": "16.4.2",
+      "version": "16.4.3",
       "major_version": "16",
       "sla": {
         "monthly_percentage": "99.9%",

diff --git a/docs/pages/reference/agent-services/agent-services.mdx b/docs/pages/reference/agent-services/agent-services.mdx
@@ -4,7 +4,9 @@ h1: Agent Service References
 description: Includes guides to use while using the SSH Service, Database Service, and other Teleport Agent services.
 ---
 
-Use these reference guides to configure and run the SSH Service, Database
-Service, and other Teleport Agent services.
+Use these reference guides to configure and run Teleport Agent services. For a
+comprehensive list of options you can configure when running the `teleport`
+binary, including all options for Agent services, consult the [Teleport
+Configuration Reference](../config.mdx).
 
 (!toc!)
diff --git a/lib/auth/auth.go b/lib/auth/auth.go
@@ -1202,30 +1202,6 @@ func (a *Server) syncUpgradeWindowStartHour(ctx context.Context) error {
 	return nil
 }
 
-func (a *Server) periodicSyncUpgradeWindowStartHour() {
-	checkInterval := interval.New(interval.Config{
-		Duration:      time.Minute * 3,
-		FirstDuration: utils.FullJitter(time.Second * 30),
-		Jitter:        retryutils.NewSeventhJitter(),
-	})
-	defer checkInterval.Stop()
-
-	for {
-		select {
-		case <-checkInterval.Next():
-			if err := a.syncUpgradeWindowStartHour(a.closeCtx); err != nil {
-				if a.closeCtx.Err() == nil {
-					// we run this periodic at a fairly high frequency, so errors are just
-					// logged but otherwise ignored.
-					log.Warnf("Failed to sync upgrade window start hour: %v", err)
-				}
-			}
-		case <-a.closeCtx.Done():
-			return
-		}
-	}
-}
-
 // periodicIntervalKey is used to uniquely identify the subintervals registered with
 // the interval.MultiInterval instance that we use for managing periodics operations.
 
@@ -1426,7 +1402,7 @@ func (a *Server) runPeriodicOperations() {
 			case dynamicLabelsCheckKey:
 				go a.syncDynamicLabelsAlert(a.closeCtx)
 			case upgradeWindowCheckKey:
-				go a.periodicSyncUpgradeWindowStartHour()
+				go a.syncUpgradeWindowStartHour(a.closeCtx)
 			case roleCountKey:
 				go a.tallyRoles(a.closeCtx)
 			}