Merge branch 'main' into protobuf-with-plugin

Author: ebroberson

cmd/rep/config/config.go

@@ -97,6 +97,7 @@ type RepConfig struct {
 	PlacementTags             []string              `json:"placement_tags"`
 	PollingInterval           durationjson.Duration `json:"polling_interval,omitempty"`
 	PreloadedRootFS           RootFSes              `json:"preloaded_root_fs"`
+	SidecarRootFSPath         string                `json:"sidecar_root_fs_path"`
 	ServerCertFile            string                `json:"server_cert_file"` // DEPRECATED. Kept around for dusts compatability
 	ServerKeyFile             string                `json:"server_key_file"`  // DEPRECATED. Kept around for dusts compatability
 	CertFile                  string                `json:"cert_file"`

cmd/rep/main.go

@@ -89,8 +89,9 @@ func main() {
 	}
 
 	rootFSMap := repConfig.PreloadedRootFS.StackPathMap()
+	sidecarRootFSPath := repConfig.SidecarRootFSPath
 
-	executorClient, containerMetricsProvider, executorMembers, err := executorinit.Initialize(logger, repConfig.ExecutorConfig, repConfig.CellID, repConfig.Zone, rootFSMap, metronClient, clock)
+	executorClient, containerMetricsProvider, executorMembers, err := executorinit.Initialize(logger, repConfig.ExecutorConfig, repConfig.CellID, repConfig.Zone, rootFSMap, sidecarRootFSPath, metronClient, clock)
 	if err != nil {
 		logger.Error("failed-to-initialize-executor", err)
 		os.Exit(1)
@@ -135,7 +136,7 @@ func main() {
 	)
 
 	requestTypes := []string{
-		"State", "ContainerMetrics", "Perform", "Reset", "UpdateLRPInstance", "StopLRPInstance", "CancelTask", //over https only
+		"State", "ContainerMetrics", "Perform", "Reset", "UpdateLRPInstance", "StopLRPInstance", "CancelTask", // over https only
 	}
 	requestMetrics := helpers.NewRequestMetricsNotifier(logger, clock, metronClient, time.Duration(repConfig.ReportInterval), requestTypes)
 	httpServer := initializeServer(auctionCellRep, executorClient, evacuatable, requestMetrics, logger, repConfig, false)
@@ -271,7 +272,6 @@ func initializeServer(
 	handlers := handlers.New(auctionCellRep, auctionCellRep, executorClient, evacuatable, requestMetrics, logger, networkAccessible)
 	routes := rep.NewRoutes(networkAccessible)
 	router, err := rata.NewRouter(routes, handlers)
-
 	if err != nil {
 		logger.Fatal("failed-to-construct-router", err)
 	}

cmd/rep/main_test.go

@@ -464,6 +464,23 @@ var _ = Describe("The Rep", func() {
 				)))
 			})
 		})
+
+		Context("when there is an explixitly specified rootfs path", func() {
+			BeforeEach(func() {
+				repConfig.PreloadedRootFS = append(repConfig.PreloadedRootFS, config.RootFS{
+					Name: "another",
+					Path: "/path/to/another/rootfs",
+				})
+				repConfig.SidecarRootFSPath = "/path/to/another/rootfs"
+			})
+
+			It("uses the specified rootfs path", func() {
+				Eventually(createRequestReceived).Should(Receive(And(
+					ContainSubstring(`check-`),
+					ContainSubstring(`/path/to/another/rootfs`),
+				)))
+			})
+		})
 	})
 
 	Context("when Garden is available", func() {