feat: add shipwright build runs to k8s-watcher

SwissDataScienceCenter · Jan 8, 2025 · 035e52b · 035e52b
1 parent dbdf462
commit 035e52b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/k8s-watcher/config.go b/k8s-watcher/config.go
@@ -96,6 +96,23 @@ func NewConfigFromEnvOrDie(prefix string) Config {
 		config.AmaltheaSessionPlural = "amaltheasessions"
 	}
 
+	if ibGroup, ok := os.LookupEnv(fmt.Sprintf("%sSHIPWRIGHT_BUILDRUN_GROUP", prefix)); ok {
+		config.ShipwrightBuildRunGroup = ibGroup
+	} else {
+		config.ShipwrightBuildRunGroup = "shipwright.io"
+	}
+
+	if ibVersion, ok := os.LookupEnv(fmt.Sprintf("%sSHIPWRIGHT_BUILDRUN_VERSION", prefix)); ok {
+		config.ShipwrightBuildRunVersion = ibVersion
+	} else {
+		config.ShipwrightBuildRunVersion = "v1beta1"
+	}
+
+	if ibPlural, ok := os.LookupEnv(fmt.Sprintf("%sSHIPWRIGHT_BUILDRUN_PLURAL", prefix)); ok {
+		config.ShipwrightBuildRunPlural = ibPlural
+	} else {
+		config.ShipwrightBuildRunPlural = "buildruns"
+	}
 	if port, ok := os.LookupEnv(fmt.Sprintf("%sPORT", prefix)); ok {
 		portInt, err := strconv.Atoi(port)
 		if err != nil {

diff --git a/k8s-watcher/server_routes.go b/k8s-watcher/server_routes.go
@@ -20,8 +20,8 @@ func (s *Server) registerRoutes() {
 	s.router.HandlerFunc("GET", "/users/:userID/sessions", s.asUserID)
 	s.router.HandlerFunc("GET", "/users/:userID/sessions/:serverID", s.asUserIDServerID)
 	// Used for the shipwright operator in charge of image build custom resources
-	s.router.HandlerFunc("GET", "/builds", s.ibGetAll)
-	s.router.HandlerFunc("GET", "/builds/:buildID", s.ibGetOne)
+	s.router.HandlerFunc("GET", "/buildruns", s.ibGetAll)
+	s.router.HandlerFunc("GET", "/buildruns/:buildID", s.ibGetOne)
 }
 
 func (s *Server) jsGetAll(w http.ResponseWriter, req *http.Request) {