Gets token proper and introduces a clean env name

uselagoon · Dec 5, 2023 · 6470bb6 · 6470bb6
1 parent 601c2fa
commit 6470bb6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/RoboFile.php b/RoboFile.php
@@ -133,10 +133,12 @@ private function grabCluster($token = null, $kubeContext = null)
             return KubernetesCluster::fromKubeConfigVariable($kubeContext)
               ->withToken($token);
         }
+        $deployTokenFile = file_exists("/var/run/secrets/lagoon/deployer/token") ? "/var/run/secrets/lagoon/deployer/token" : "/var/run/secrets/kubernetes.io/serviceaccount/token";
+
         $cluster = KubernetesCluster::inClusterConfiguration(
           "https://kubernetes.default.svc.cluster.local"
         )
-          ->loadTokenFromFile("/var/run/secrets/lagoon/deployer/token");
+          ->loadTokenFromFile($deployTokenFile);
         return $cluster;
     }
 
@@ -148,11 +150,19 @@ protected function getToken($token = null)
         if (!empty($token)) {
             return $token;
         }
+
         $inClusterTokenFile = "/var/run/secrets/lagoon/deployer/token";
 
         if (file_exists($inClusterTokenFile)) {
             return trim(file_get_contents($inClusterTokenFile));
         }
+
+        $inClusterTokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+
+        if (file_exists($inClusterTokenFile)) {
+            return trim(file_get_contents($inClusterTokenFile));
+        }
+
     }
 
 

diff --git a/src/Step/StepParent.php b/src/Step/StepParent.php
@@ -58,9 +58,11 @@ public function run(array $args) {
    */
   public function doTextSubstitutions($string)
   {
+    $environmentClean = str_replace("/","-", $this->args->environment);
     $extraSubs = [
       'project' => $this->args->project,
       'environment' => $this->args->environment,
+      'environmentClean' => $environmentClean,
       'namespace' => $this->args->namespace,
     ];