feat: support to provide container hostname (#1002) (#1012)

mergify[bot] · tanmoysrt · web-flow · commit 6d20f284a5cc · 2024-09-14T10:28:25.000+05:30
(cherry picked from commit a1a5d6d) Co-authored-by: Tanmoy Sarkar <57363826+tanmoysrt@users.noreply.github.com>
diff --git a/container_manager/service.go b/container_manager/service.go
@@ -26,6 +26,7 @@ func (m Manager) GetService(serviceName string) (Service, error) {
 	service := Service{
 		Name:     serviceData.Spec.Name,
 		Image:    serviceData.Spec.TaskTemplate.ContainerSpec.Image,
+		Hostname: serviceData.Spec.TaskTemplate.ContainerSpec.Hostname,
 		Command:  serviceData.Spec.TaskTemplate.ContainerSpec.Command,
 		Env:      make(map[string]string),
 		Networks: []string{},
@@ -456,11 +457,12 @@ func (m Manager) serviceToServiceSpec(service Service) (swarm.ServiceSpec, error
 		TaskTemplate: swarm.TaskSpec{
 			// Set container spec
 			ContainerSpec: &swarm.ContainerSpec{
-				Image:   service.Image,
-				Command: service.Command,
-				Env:     env,
-				Mounts:  volumeMounts,
-				Configs: configs,
+				Image:    service.Image,
+				Command:  service.Command,
+				Hostname: service.Hostname,
+				Env:      env,
+				Mounts:   volumeMounts,
+				Configs:  configs,
 				Privileges: &swarm.Privileges{
 					NoNewPrivileges: true,
 					AppArmor: &swarm.AppArmorOpts{
diff --git a/container_manager/types.go b/container_manager/types.go
@@ -21,6 +21,7 @@ const (
 type Service struct {
 	Name                 string            `json:"name"`
 	Image                string            `json:"image"`
+	Hostname             string            `json:"hostname,omitempty"`
 	Command              []string          `json:"command,omitempty"`
 	Env                  map[string]string `json:"env,omitempty"`
 	Capabilities         []string          `json:"capabilities,omitempty"`
diff --git a/swiftwave_service/core/models.go b/swiftwave_service/core/models.go
@@ -226,6 +226,8 @@ type Application struct {
 	Name string `json:"name" gorm:"unique"`
 	// ApplicationGroupID - if set, this application will be part of the application group
 	ApplicationGroupID *string `json:"application_group_id"`
+	// Hostname - hostname of the container, can be blank
+	Hostname string `json:"hostname"`
 	// Environment Variables
 	// On change of environment variables, deployment will be triggered by force update
 	EnvironmentVariables []EnvironmentVariable `json:"environment_variables" gorm:"foreignKey:ApplicationID;constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
diff --git a/swiftwave_service/db/migrations/20240906153014_add_hostname_in_application.down.sql b/swiftwave_service/db/migrations/20240906153014_add_hostname_in_application.down.sql
@@ -0,0 +1,2 @@
+-- reverse: modify "applications" table
+ALTER TABLE "public"."applications" DROP COLUMN "hostname";
diff --git a/swiftwave_service/db/migrations/20240906153014_add_hostname_in_application.up.sql b/swiftwave_service/db/migrations/20240906153014_add_hostname_in_application.up.sql
@@ -0,0 +1,2 @@
+-- modify "applications" table
+ALTER TABLE "public"."applications" ADD COLUMN "hostname" text NULL;
diff --git a/swiftwave_service/db/migrations/atlas.sum b/swiftwave_service/db/migrations/atlas.sum
@@ -1,4 +1,4 @@
-h1:k1qJKQt8Sk2nl3wA2bU97eDfUN6gf5sarKNVQ0Ez5Lw=
+h1:dFMxl02tstPc5Nmao8FA3S7sM7mIXqsSy34VElMP2gk=
 20240413191732_init.down.sql h1:HoitObGwuKF/akF4qg3dol2FfNTLCEuf6wHYDuCez8I=
 20240413191732_init.up.sql h1:USKdQx/yTz1KJ0+mDwYGhKm3WzX7k+I9+6B6SxImwaE=
 20240414051823_server_custom_ssh_port_added.down.sql h1:IC1DFQBQceTPTRdZOo5/WqytH+ZbgcKrQuMCkhArF/0=
@@ -45,3 +45,5 @@ h1:k1qJKQt8Sk2nl3wA2bU97eDfUN6gf5sarKNVQ0Ez5Lw=
 20240626072036_move_application_group_to_relation.up.sql h1:SNdKqmYmIZeE0JcgKiLYFajW/awiz4rXRSAKVdabPZg=
 20240628175617_add_extra_fields_in_app_group.down.sql h1:T/QBEilqWYysok6l2wxZAlYK1Z6ceSQLUmers5fZNig=
 20240628175617_add_extra_fields_in_app_group.up.sql h1:+qBOQc/2bhG1igFdUbWSsZEy01aORuPyBPvxKVXJJoA=
+20240906153014_add_hostname_in_application.down.sql h1:tFY94wo3G+UYA51UYt9jbfwwPTS/hCd3pG2F7smUEB8=
+20240906153014_add_hostname_in_application.up.sql h1:JAhs73vgSIUzt0l8M8ltRp98dVkwL5lXrdkfHvJ+arE=
diff --git a/swiftwave_service/graphql/application_group.resolvers.go b/swiftwave_service/graphql/application_group.resolvers.go
diff --git a/swiftwave_service/graphql/generated.go b/swiftwave_service/graphql/generated.go
diff --git a/swiftwave_service/graphql/graphql_object_mapper.go b/swiftwave_service/graphql/graphql_object_mapper.go
@@ -377,6 +377,7 @@ func applicationInputToDatabaseObject(record *model.ApplicationInput) *core.Appl
 		LatestDeployment:         *applicationInputToDeploymentDatabaseObject(record),
 		Deployments:              make([]core.Deployment, 0),
 		IngressRules:             make([]core.IngressRule, 0),
+		Hostname:                 record.Hostname,
 		Command:                  record.Command,
 		Capabilities:             record.Capabilities,
 		Sysctls:                  record.Sysctls,
@@ -404,6 +405,7 @@ func applicationToGraphqlObject(record *core.Application) *model.Application {
 		ResourceLimit:            resourceLimitToGraphqlObject(&record.ResourceLimit),
 		ReservedResource:         reservedResourceToGraphqlObject(&record.ReservedResource),
 		IsSleeping:               record.IsSleeping,
+		Hostname:                 record.Hostname,
 		Command:                  record.Command,
 		ApplicationGroupID:       record.ApplicationGroupID,
 		PreferredServerHostnames: record.PreferredServerHostnames,
@@ -753,6 +755,7 @@ func stackToApplicationsInput(applicationGroupID *string, record *stack_parser.S
 			CodePath:                     nil,
 			SourceCodeCompressedFileName: nil,
 			ApplicationGroupID:           applicationGroupID,
+			Hostname:                     service.Hostname,
 			Command:                      command,
 			CustomHealthCheck: &model.ApplicationCustomHealthCheckInput{
 				Enabled:              service.CustomHealthCheck.Enabled,
diff --git a/swiftwave_service/graphql/model/models_gen.go b/swiftwave_service/graphql/model/models_gen.go
diff --git a/swiftwave_service/graphql/schema/application.graphqls b/swiftwave_service/graphql/schema/application.graphqls
@@ -55,6 +55,7 @@ type Application {
     webhookToken: String!
     isSleeping: Boolean!
     command: String!
+    hostname: String!
     applicationGroupID: String
     applicationGroup: ApplicationGroup
     preferredServerHostnames: [String!]!
@@ -108,6 +109,7 @@ input ApplicationInput {
     sourceCodeCompressedFileName: String
     # required for upstreamType = "Image"
     dockerImage: String
+    hostname: String!
     imageRegistryCredentialID: Uint
     applicationGroupID: String
     preferredServerHostnames: [String!]!
diff --git a/swiftwave_service/stack_parser/types.go b/swiftwave_service/stack_parser/types.go
@@ -152,6 +152,7 @@ type Service struct {
 	Environment              KeyValuePair      `yaml:"environment"`
 	CapAdd                   []string          `yaml:"cap_add"`
 	Sysctls                  KeyValuePair      `yaml:"sysctls"`
+	Hostname                 string            `yaml:"hostname"`
 	Command                  Command           `yaml:"command"`
 	Configs                  []Config          `yaml:"configs"`
 	CustomHealthCheck        CustomHealthCheck `yaml:"custom_health_check"`
diff --git a/swiftwave_service/worker/process_application_deploy_request.go b/swiftwave_service/worker/process_application_deploy_request.go
@@ -224,6 +224,7 @@ func (m Manager) deployApplicationHelper(request DeployApplicationRequest, docke
 	service := containermanger.Service{
 		Name:                 application.Name,
 		Image:                dockerImageUri,
+		Hostname:             application.Hostname,
 		Command:              command,
 		Env:                  environmentVariablesMap,
 		Networks:             []string{m.Config.SystemConfig.NetworkName},

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- reverse: modify "applications" table`
	`2`	`+ALTER TABLE "public"."applications" DROP COLUMN "hostname";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- modify "applications" table`
	`2`	`+ALTER TABLE "public"."applications" ADD COLUMN "hostname" text NULL;`