refactor: default service type to ClusterIP (#488)

dailydotdev · Jan 15, 2025 · 8350ac5 · 8350ac5
1 parent 8864591
commit 8350ac5
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 76 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,19 +21,19 @@
   "dependencies": {
     "@google-cloud/pubsub": "^4.9.0",
     "@pulumi/gcp": "^8.13.1",
-    "@pulumi/kubernetes": "^4.19.0",
+    "@pulumi/kubernetes": "^4.20.0",
     "@pulumi/pulumi": "^3.145.0",
     "knex": "^3.1.0",
     "mysql": "^2.18.1",
     "pg": "^8.13.1",
     "yaml": "^2.7.0"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.19.1",
-    "@typescript-eslint/parser": "^8.19.1",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "eslint": "^8.57.1",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-config-prettier": "^10.0.1",
+    "eslint-plugin-prettier": "^5.2.2",
     "prettier": "^3.4.2",
     "typescript": "^5.7.3"
   }

diff --git a/src/k8s.ts b/src/k8s.ts
@@ -445,7 +445,7 @@ export const createAutoscaledExposedApplication = ({
   serviceTimeout,
   shouldCreatePDB = true,
   provider,
-  serviceType = 'NodePort',
+  serviceType = 'ClusterIP',
   strategy = {
     type: 'RollingUpdate',
     rollingUpdate: {

diff --git a/src/suite/index.ts b/src/suite/index.ts
@@ -252,7 +252,6 @@ function deployApplication(
     imageTag,
     containerOpts,
     provider,
-    vpcNative,
     isAdhocEnv,
   }: ApplicationContext,
   {
@@ -336,7 +335,7 @@ function deployApplication(
   if (shouldCreateService) {
     return createAutoscaledExposedApplication({
       ...appArgs,
-      serviceType: vpcNative ? 'ClusterIP' : serviceType,
+      serviceType,
       enableCdn,
       serviceTimeout,
       backendConfig,
@@ -361,7 +360,6 @@ export function deployApplicationSuiteToProvider({
   apps,
   provider,
   resourcePrefix = '',
-  vpcNative = false,
   migration,
   migrations,
   debezium,
@@ -482,7 +480,6 @@ export function deployApplicationSuiteToProvider({
     imageTag,
     image,
     provider,
-    vpcNative,
     isAdhocEnv,
   };
   // Deploy the applications
@@ -514,7 +511,7 @@ export function deployApplicationSuiteToProvider({
 export function deployApplicationSuite(
   suite: Omit<
     ApplicationSuiteArgs,
-    'provider' | 'resourcePrefix' | 'vpcNative' | 'shouldBindIamUser'
+    'provider' | 'resourcePrefix' | 'shouldBindIamUser'
   >,
   vpcNativeProvider?: GkeCluster,
 ): ApplicationReturn[][] {
@@ -531,7 +528,6 @@ export function deployApplicationSuite(
       shouldBindIamUser: true,
       provider: (vpcNativeProvider || getVpcNativeCluster()).provider,
       resourcePrefix: 'vpc-native-',
-      vpcNative: true,
     });
     return [vpcNativeApps];
   }

diff --git a/src/suite/types.ts b/src/suite/types.ts
@@ -109,7 +109,6 @@ export type ApplicationSuiteArgs = {
   apps: ApplicationArgs[];
   provider?: ProviderResource;
   resourcePrefix?: string;
-  vpcNative?: boolean;
   migration?: MigrationArgs;
   migrations?: { [key: string]: MigrationArgs };
   debezium?: DebeziumArgs;
@@ -128,6 +127,5 @@ export type ApplicationContext = {
   imageTag: string;
   containerOpts: ContainerOptions;
   provider?: ProviderResource;
-  vpcNative: boolean;
   isAdhocEnv?: boolean;
 };