Merge pull request #1568 from omerlh/fix/service-account-custom-path

k8s-ci-robot · web-flow · commit 2bea10c9321c · 2024-02-11T11:40:09.000-08:00
fix: use load from cluster when default service mount is disabled
diff --git a/src/config.ts b/src/config.ts
@@ -369,7 +369,10 @@ export class KubeConfig {
             }
         }
 
-        if (fileExists(Config.SERVICEACCOUNT_TOKEN_PATH)) {
+        if (
+            fileExists(Config.SERVICEACCOUNT_TOKEN_PATH) ||
+            (process.env.TOKEN_FILE_PATH !== undefined && process.env.TOKEN_FILE_PATH !== '')
+        ) {
             this.loadFromCluster();
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,10 @@ export class KubeConfig {`
`369`	`369`	`}`
`370`	`370`	`}`
`371`	`371`
`372`		`- if (fileExists(Config.SERVICEACCOUNT_TOKEN_PATH)) {`
	`372`	`+ if (`
	`373`	`+ fileExists(Config.SERVICEACCOUNT_TOKEN_PATH) \|\|`
	`374`	`+ (process.env.TOKEN_FILE_PATH !== undefined && process.env.TOKEN_FILE_PATH !== '')`
	`375`	`+ ) {`
`373`	`376`	`this.loadFromCluster();`
`374`	`377`	`return;`
`375`	`378`	`}`