Fix bug with CloudRunner and K8s with Namespaces (#763)

* Fixes bug where kubectl picks a different namespace (e.g. cloud runner is kicked from self hosted k8s agents that are in a non default namespace)

* update generated content

* Add support for setting a namespace for containers in Cloud Runner

dist/index.js

@@ -331,6 +331,7 @@ class BuildParameters {
             kubeConfig: cloud_runner_options_1.default.kubeConfig,
             containerMemory: cloud_runner_options_1.default.containerMemory,
             containerCpu: cloud_runner_options_1.default.containerCpu,
+            containerNamespace: cloud_runner_options_1.default.containerNamespace,
             kubeVolumeSize: cloud_runner_options_1.default.kubeVolumeSize,
             kubeVolume: cloud_runner_options_1.default.kubeVolume,
             postBuildContainerHooks: cloud_runner_options_1.default.postBuildContainerHooks,
@@ -1220,6 +1221,9 @@ class CloudRunnerOptions {
     static get containerMemory() {
         return CloudRunnerOptions.getInput('containerMemory') || `3072`;
     }
+    static get containerNamespace() {
+        return CloudRunnerOptions.getInput('containerNamespace') || `default`;
+    }
     static get customJob() {
         return CloudRunnerOptions.getInput('customJob') || '';
     }
@@ -3372,7 +3376,6 @@ const remote_client_logger_1 = __nccwpck_require__(59412);
 const kubernetes_role_1 = __nccwpck_require__(88231);
 const cloud_runner_system_1 = __nccwpck_require__(4197);
 class Kubernetes {
-    // eslint-disable-next-line no-unused-vars
     constructor(buildParameters) {
         this.buildGuid = '';
         this.pvcName = '';
@@ -3390,7 +3393,7 @@ class Kubernetes {
         this.kubeClientApps = this.kubeConfig.makeApiClient(k8s.AppsV1Api);
         this.kubeClientBatch = this.kubeConfig.makeApiClient(k8s.BatchV1Api);
         this.rbacAuthorizationV1Api = this.kubeConfig.makeApiClient(k8s.RbacAuthorizationV1Api);
-        this.namespace = 'default';
+        this.namespace = buildParameters.containerNamespace ? buildParameters.containerNamespace : 'default';
         cloud_runner_logger_1.default.log('Loaded default Kubernetes configuration for this environment');
     }
     async PushLogUpdate(logs) {
@@ -4070,8 +4073,8 @@ class KubernetesTaskRunner {
             cloud_runner_logger_1.default.log(`Streaming logs from pod: ${podName} container: ${containerName} namespace: ${namespace} ${cloud_runner_1.default.buildParameters.kubeVolumeSize}/${cloud_runner_1.default.buildParameters.containerCpu}/${cloud_runner_1.default.buildParameters.containerMemory}`);
             let extraFlags = ``;
             extraFlags += (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient))
-                ? ` -f -c ${containerName}`
+                ? ` -f -c ${containerName} -n ${namespace}`
-                : ` --previous`;
+                : ` --previous -n ${namespace}`;
             const callback = (outputChunk) => {
                 output += outputChunk;
                 // split output chunk and handle per line

src/model/build-parameters.ts

@@ -59,6 +59,7 @@ class BuildParameters {
   public kubeConfig!: string;
   public containerMemory!: string;
   public containerCpu!: string;
+  public containerNamespace!: string;
   public kubeVolumeSize!: string;
   public kubeVolume!: string;
   public kubeStorageClass!: string;
@@ -187,6 +188,7 @@ class BuildParameters {
       kubeConfig: CloudRunnerOptions.kubeConfig,
       containerMemory: CloudRunnerOptions.containerMemory,
       containerCpu: CloudRunnerOptions.containerCpu,
+      containerNamespace: CloudRunnerOptions.containerNamespace,
       kubeVolumeSize: CloudRunnerOptions.kubeVolumeSize,
       kubeVolume: CloudRunnerOptions.kubeVolume,
       postBuildContainerHooks: CloudRunnerOptions.postBuildContainerHooks,

src/model/cloud-runner/options/cloud-runner-options.ts

@@ -135,6 +135,10 @@ class CloudRunnerOptions {
     return CloudRunnerOptions.getInput('containerMemory') || `3072`;
   }
 
+  static get containerNamespace(): string {
+    return CloudRunnerOptions.getInput('containerNamespace') || `default`;
+  }
+
   static get customJob(): string {
     return CloudRunnerOptions.getInput('customJob') || '';
   }

src/model/cloud-runner/providers/k8s/index.ts

@@ -37,7 +37,6 @@ class Kubernetes implements ProviderInterface {
   public serviceAccountName: string = '';
   public ip: string = '';
 
-  // eslint-disable-next-line no-unused-vars
   constructor(buildParameters: BuildParameters) {
     Kubernetes.Instance = this;
     this.kubeConfig = new k8s.KubeConfig();
@@ -46,7 +45,7 @@ class Kubernetes implements ProviderInterface {
     this.kubeClientApps = this.kubeConfig.makeApiClient(k8s.AppsV1Api);
     this.kubeClientBatch = this.kubeConfig.makeApiClient(k8s.BatchV1Api);
     this.rbacAuthorizationV1Api = this.kubeConfig.makeApiClient(k8s.RbacAuthorizationV1Api);
-    this.namespace = 'default';
+    this.namespace = buildParameters.containerNamespace ? buildParameters.containerNamespace : 'default';
     CloudRunnerLogger.log('Loaded default Kubernetes configuration for this environment');
   }
 

src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts

@@ -30,8 +30,8 @@ class KubernetesTaskRunner {
       );
       let extraFlags = ``;
       extraFlags += (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient))
-        ? ` -f -c ${containerName}`
+        ? ` -f -c ${containerName} -n ${namespace}`
-        : ` --previous`;
+        : ` --previous -n ${namespace}`;
 
       const callback = (outputChunk: string) => {
         output += outputChunk;