Continue Renaming "Armada" to "Server" (#3975)

* Rename armada to server Signed-off-by: Chris Martin <[email protected]> * Reemove postgresPulsarMigration.run.xml Signed-off-by: Chris Martin <[email protected]> * Fix postgres migration Signed-off-by: Chris Martin <[email protected]> * Fix goreleaser Signed-off-by: Chris Martin <[email protected]> * Fix goreleaser Signed-off-by: Chris Martin <[email protected]> * Fix goreleaser Signed-off-by: Chris Martin <[email protected]> --------- Signed-off-by: Chris Martin <[email protected]>
armadaproject · Sep 30, 2024 · 6fbaa59 · 6fbaa59
1 parent 5910a4b
commit 6fbaa59
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -25,7 +25,7 @@ builds:
   - env: [CGO_ENABLED=0]
     id: server
     binary: server
-    main: ./cmd/armada/main.go
+    main: ./cmd/server/main.go
     mod_timestamp: '{{ .CommitTimestamp }}'
     goos:
       - linux
@@ -197,7 +197,7 @@ dockers:
       - scheduler
       - scheduleringester
     extra_files:
-      - config/armada/config.yaml
+      - config/server/config.yaml
       - config/executor/config.yaml
       - config/binoculars/config.yaml
       - config/eventingester/config.yaml
@@ -244,7 +244,7 @@ dockers:
       - lookoutingesterv2
       - fakeexecutor
     extra_files:
-      - config/armada/config.yaml
+      - config/server/config.yaml
       - config/executor/config.yaml
       - config/binoculars/config.yaml
       - config/eventingester/config.yaml
@@ -268,7 +268,7 @@ dockers:
     ids:
       - server
     extra_files:
-      - config/armada/config.yaml
+      - config/server/config.yaml
     dockerfile: ./build/server/Dockerfile
 
   - id: executor

diff --git a/.run/Armada.run.xml b/.run/Armada.run.xml
@@ -8,7 +8,7 @@
     <toRun name="Server" type="GoApplicationRunConfiguration" />
     <toRun name="Scheduler" type="GoApplicationRunConfiguration" />
     <toRun name="Scheduler Ingester" type="GoApplicationRunConfiguration" />
-    <toRun name="postgresPulsarMigration" type="GoApplicationRunConfiguration" />
+    <toRun name="schedulerPostgresMigration" type="GoApplicationRunConfiguration" />
     <method v="2" />
   </configuration>
   <configuration default="false" name="Armada (Pulsar Scheduler)" type="CompoundRunConfigurationType">

diff --git a/.run/Server.run.xml b/.run/Server.run.xml
@@ -15,7 +15,7 @@
     <kind value="FILE" />
     <package value="github.com/armadaproject/armada" />
     <directory value="$PROJECT_DIR$" />
-    <filePath value="$PROJECT_DIR$/cmd/armada/main.go" />
+    <filePath value="$PROJECT_DIR$/cmd/server/main.go" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/postgresPulsarMigration.run.xml → .run/schedulerPostgresMigration.run.xml b/.run/postgresPulsarMigration.run.xml → .run/schedulerPostgresMigration.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="postgresPulsarMigration" type="GoApplicationRunConfiguration" factoryName="Go Application">
+  <configuration default="false" name="schedulerPostgresMigration" type="GoApplicationRunConfiguration" factoryName="Go Application">
     <module name="armada" />
     <working_directory value="$PROJECT_DIR$" />
     <parameters value="migrateDatabase" />

diff --git a/build/bundles/armada/Dockerfile b/build/bundles/armada/Dockerfile
@@ -8,7 +8,7 @@ RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
 
 # Server
-COPY config/armada/config.yaml /app/config/armada/config.yaml
+COPY config/server/config.yaml /app/config/server/config.yaml
 
 # Executor
 COPY config/executor/config.yaml /app/config/executor/config.yaml

diff --git a/build/server/Dockerfile b/build/server/Dockerfile
@@ -9,7 +9,7 @@ RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
 
 COPY server /app/
-COPY config/armada/config.yaml /app/config/armada/config.yaml
+COPY config/server/config.yaml /app/config/server/config.yaml
 
 WORKDIR /app
 

diff --git a/cmd/armada/main.go → cmd/server/main.go b/cmd/armada/main.go → cmd/server/main.go
@@ -41,7 +41,7 @@ func main() {
 	// TODO Load relevant config in one place: don't use viper here and in LoadConfig.
 	var config configuration.ArmadaConfig
 	userSpecifiedConfigs := viper.GetStringSlice(CustomConfigLocation)
-	common.LoadConfig(&config, "./config/armada", userSpecifiedConfigs)
+	common.LoadConfig(&config, "./config/server", userSpecifiedConfigs)
 
 	log.Info("Starting...")
 

diff --git a/config/armada/config.yaml → config/server/config.yaml b/config/armada/config.yaml → config/server/config.yaml