PMM-11261 Update PMM via watchtower

api/serverpb/json/serverpb.json

@@ -805,7 +805,13 @@
             "in": "body",
             "required": true,
             "schema": {
-              "type": "object"
+              "type": "object",
+              "properties": {
+                "new_image": {
+                  "type": "string",
+                  "x-order": 0
+                }
+              }
             }
           }
         ],

api/serverpb/server.proto

@@ -79,7 +79,9 @@ message CheckUpdatesResponse {
   google.protobuf.Timestamp last_check = 5;
 }
 
-message StartUpdateRequest {}
+message StartUpdateRequest {
+  string new_image = 1;
+}
 
 message StartUpdateResponse {
   // Authentication token for getting update statuses.

api/swagger/swagger-dev.json

@@ -3649,7 +3649,13 @@
             "in": "body",
             "required": true,
             "schema": {
-              "type": "object"
+              "type": "object",
+              "properties": {
+                "new_image": {
+                  "type": "string",
+                  "x-order": 0
+                }
+              }
             }
           }
         ],

api/swagger/swagger.json

@@ -805,7 +805,13 @@
             "in": "body",
             "required": true,
             "schema": {
-              "type": "object"
+              "type": "object",
+              "properties": {
+                "new_image": {
+                  "type": "string",
+                  "x-order": 0
+                }
+              }
             }
           }
         ],

docker-compose.yml

@@ -23,6 +23,8 @@ services:
       - ENABLE_RBAC=${ENABLE_RBAC:-0}
       - LESS_LOG_NOISE=1
       - PERCONA_TEST_VERSION_SERVICE_URL=${PERCONA_TEST_VERSION_SERVICE_URL}
+      - PMM_WATCHTOWER_HOST=${PMM_WATCHTOWER_HOST:-http://watchtower:8080}
+      - PMM_WATCHTOWER_TOKEN=${PMM_WATCHTOWER_TOKEN:-123}
       # - PERCONA_TEST_PLATFORM_ADDRESS=https://check.localhost
       # - PERCONA_TEST_PLATFORM_INSECURE=1
       # - PERCONA_TEST_PLATFORM_PUBLIC_KEY=<public key>
@@ -94,6 +96,22 @@ services:
     #     /opt/entrypoint.sh
     #   "
 
+# docker run -v /var/run/docker.sock:/var/run/docker.sock -e WATCHTOWER_HTTP_API_UPDATE=1 -e WATCHTOWER_HTTP_API_TOKEN=123 --hostname=watchtower --network=pmm_default docker.io/bupychuk/watchtower
+  watchtower:
+    profiles:
+      - pmm
+    image: ${WATCHTOWER_IMAGE:-bupychuk/watchtower}
+    container_name: watchtower
+    environment:
+        - WATCHTOWER_HTTP_LISTEN_PORT=8080
+        - WATCHTOWER_HTTP_API_UPDATE=1
+        - WATCHTOWER_HTTP_API_TOKEN=${PMM_WATCHTOWER_TOKEN:-123}
+    hostname: watchtower
+    networks:
+      - ${NETWORK:-default}
+    volumes:
+        - /var/run/docker.sock:${DOCKER_PATH:-/var/run/docker.sock}
+
   # PMM with external DBs
   ch:
     profiles:

managed/cmd/pmm-managed/main.go

@@ -969,6 +969,20 @@ func main() { //nolint:cyclop,maintidx
 
 	dumpService := dump.New(db)
 
+	// Get the hostname from the environment variable
+	watchtowerHost := os.Getenv("PMM_WATCHTOWER_HOST")
+	if watchtowerHost == "" {
+		watchtowerHost = "http://watchtower:8080"
+	}
+
+	// Create a URL with the images and new image name as query parameters
+	u, err := url.Parse(watchtowerHost)
+	if err != nil {
+		l.Fatalf("Failed to parse watchtower hostname: %s", err)
+	}
+
+	updater := server.NewUpdater(supervisord, u)
+
 	serverParams := &server.Params{
 		DB:                   db,
 		VMDB:                 vmdb,
@@ -981,6 +995,7 @@ func main() { //nolint:cyclop,maintidx
 		AwsInstanceChecker:   awsInstanceChecker,
 		GrafanaClient:        grafanaClient,
 		VMAlertExternalRules: externalRules,
+		Updater:              updater,
 	}
 
 	server, err := server.NewServer(serverParams)

managed/services/server/server.go

@@ -60,6 +60,7 @@
 	awsInstanceChecker   *AWSInstanceChecker
 	grafanaClient        grafanaClient
 	haService            haService
+	updater              *Updater
 
 	l *logrus.Entry
 
@@ -91,6 +92,7 @@
 	TelemetryService     telemetryService
 	AwsInstanceChecker   *AWSInstanceChecker
 	GrafanaClient        grafanaClient
+	Updater              *Updater
 }
 
 // NewServer returns new server for Server service.
@@ -113,6 +115,7 @@
 		telemetryService:     params.TelemetryService,
 		awsInstanceChecker:   params.AwsInstanceChecker,
 		grafanaClient:        params.GrafanaClient,
+		updater:              params.Updater,
 		l:                    logrus.WithField("component", "server"),
 		pmmUpdateAuthFile:    path,
 		envSettings:          &models.ChangeSettingsParams{},
@@ -258,16 +261,16 @@
 	s.envRW.RUnlock()
 
 	if req.OnlyInstalledVersion {
-		return s.onlyInstalledVersionResponse(ctx), nil
+		return s.updater.onlyInstalledVersionResponse(), nil
 	}
 
 	if req.Force {
-		if err := s.supervisord.ForceCheckUpdates(ctx); err != nil {
+		if err := s.updater.ForceCheckUpdates(ctx); err != nil {
 			return nil, err
 		}
 	}
 
-	v, lastCheck := s.supervisord.LastCheckUpdatesResult(ctx)
+	v, lastCheck := s.updater.LastCheckUpdatesResult(ctx)
 	if v == nil {
 		return nil, status.Error(codes.Unavailable, "failed to check for updates")
 	}
@@ -281,7 +284,7 @@
 			Version:     v.Latest.Version,
 			FullVersion: v.Latest.FullVersion,
 		},
-		UpdateAvailable: v.UpdateAvailable,
+		UpdateAvailable: true,
 		LatestNewsUrl:   v.LatestNewsURL,
 	}
 
@@ -314,19 +317,16 @@
 		return nil, status.Error(codes.FailedPrecondition, "Updates are disabled via DISABLE_UPDATES environment variable.")
 	}
 
-	offset, err := s.supervisord.StartUpdate()
-	if err != nil {
-		return nil, err
-	}
+	s.updater.StartUpdate(ctx, req.NewImage)
 
 	authToken := uuid.New().String()
-	if err = s.writeUpdateAuthToken(authToken); err != nil {
+	if err := s.writeUpdateAuthToken(authToken); err != nil {
 		return nil, err
 	}
 
 	return &serverpb.StartUpdateResponse{
 		AuthToken: authToken,
-		LogOffset: offset,
+		LogOffset: 0,
 	}, nil
 }