bug: always host on network to avoid service collision

Author: lukepolo

src/dedicated-servers/dedicated-servers.service.ts

@@ -168,13 +168,8 @@ export class DedicatedServersService {
                     },
                   ],
                 },
-                // only enable host network if steam relay is enabled
-                ...(steamRelay
-                  ? {
-                      hostNetwork: true,
-                      dnsPolicy: "ClusterFirstWithHostNet",
-                    }
-                  : {}),
+                hostNetwork: true,
+                dnsPolicy: "ClusterFirstWithHostNet",
                 affinity: {
                   nodeAffinity: {
                     requiredDuringSchedulingIgnoredDuringExecution: {
@@ -321,59 +316,6 @@ export class DedicatedServersService {
         },
       });
 
-      if (!steamRelay) {
-        this.logger.verbose(
-          `[${serverId}] create service for dedicated server`,
-        );
-
-        await this.core.createNamespacedService({
-          namespace: this.namespace,
-          body: {
-            apiVersion: "v1",
-            kind: "Service",
-            metadata: {
-              name: dedicatedServerDeploymentName,
-            },
-            spec: {
-              type: "NodePort",
-              ports: [
-                {
-                  port: server.port,
-                  targetPort: server.port,
-                  nodePort: server.port,
-                  name: "rcon",
-                  protocol: "TCP",
-                },
-                {
-                  port: server.port,
-                  targetPort: server.port,
-                  nodePort: server.port,
-                  name: "game",
-                  protocol: "UDP",
-                },
-                {
-                  port: server.tv_port,
-                  targetPort: server.tv_port,
-                  nodePort: server.tv_port,
-                  name: "tv",
-                  protocol: "TCP",
-                },
-                {
-                  port: server.tv_port,
-                  targetPort: server.tv_port,
-                  nodePort: server.tv_port,
-                  name: "tv-udp",
-                  protocol: "UDP",
-                },
-              ],
-              selector: {
-                app: dedicatedServerDeploymentName,
-              },
-            },
-          },
-        });
-      }
-
       await this.hasura.mutation({
         update_servers_by_pk: {
           __args: {
@@ -419,17 +361,6 @@ export class DedicatedServersService {
 
     const dedicatedServerDeploymentName = `dedicated-server-${serverId}`;
 
-    try {
-      await this.core.deleteNamespacedService({
-        namespace: this.namespace,
-        name: dedicatedServerDeploymentName,
-      });
-    } catch (error) {
-      if (error.code.toString() !== "404") {
-        throw error;
-      }
-    }
-
     try {
       await this.apps.deleteNamespacedDeployment({
         namespace: this.namespace,

src/matches/match-assistant/match-assistant.service.ts

@@ -573,13 +573,8 @@ export class MatchAssistantService {
                       },
                     ],
                   },
-                  // only enable host network if steam relay is enabled
-                  ...(steamRelay
-                    ? {
-                        hostNetwork: true,
-                        dnsPolicy: "ClusterFirstWithHostNet",
-                      }
-                    : {}),
+                  hostNetwork: true,
+                  dnsPolicy: "ClusterFirstWithHostNet",
                   affinity: {
                     nodeAffinity: {
                       requiredDuringSchedulingIgnoredDuringExecution: {
@@ -710,53 +705,6 @@ export class MatchAssistantService {
 
         this.logger.verbose(`[${matchId}] create service for on demand server`);
 
-        await core.createNamespacedService({
-          namespace: this.namespace,
-          body: {
-            apiVersion: "v1",
-            kind: "Service",
-            metadata: {
-              name: jobName,
-            },
-            spec: {
-              type: "NodePort",
-              ports: [
-                {
-                  port: server.port,
-                  targetPort: server.port,
-                  nodePort: server.port,
-                  name: "rcon",
-                  protocol: "TCP",
-                },
-                {
-                  port: server.port,
-                  targetPort: server.port,
-                  nodePort: server.port,
-                  name: "game",
-                  protocol: "UDP",
-                },
-                {
-                  port: server.tv_port,
-                  targetPort: server.tv_port,
-                  nodePort: server.tv_port,
-                  name: "tv",
-                  protocol: "TCP",
-                },
-                {
-                  port: server.tv_port,
-                  targetPort: server.tv_port,
-                  nodePort: server.tv_port,
-                  name: "tv-udp",
-                  protocol: "UDP",
-                },
-              ],
-              selector: {
-                job: jobName,
-              },
-            },
-          },
-        });
-
         await this.hasura.mutation({
           update_matches_by_pk: {
             __args: {
@@ -916,18 +864,6 @@ export class MatchAssistantService {
           }
         });
 
-      this.logger.verbose(`[${matchId}] remove service`);
-      await core
-        .deleteNamespacedService({
-          name: jobName,
-          namespace: this.namespace,
-        })
-        .catch((error) => {
-          if (error.code.toString() !== "404") {
-            throw error;
-          }
-        });
-
       this.logger.verbose(`[${matchId}] stopped on demand server`);
     } catch (error) {
       this.logger.error(