Merge pull request #1373 from input-output-hk/kubeconfig-improvements

chore: remove kubeconfig dependency on ~/.aws/credentials
input-output-hk · Jul 18, 2024 · 2a46b5d · 2a46b5d
2 parents 16d7d0a + 66a4293
commit 2a46b5d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,6 @@ source
 /.data
 /.config
 /.local
+
+# Auto generated
+.kube
diff --git a/nix/local/envs.nix b/nix/local/envs.nix
@@ -60,10 +60,12 @@
 
       devshell.startup.setup.text = ''
         [ -e $PRJ_ROOT/.envrc.local ] && source $PRJ_ROOT/.envrc.local
+        rm -rf $PRJ_ROOT/.kube
+        cp -R $PRJ_ROOT/nix/local/kubeconfig $PRJ_ROOT/.kube
+        chmod 600 $PRJ_ROOT/.kube/*
         kubectl config use-context $K8S_USER
         kubectl config use-context $K8S_USER --kubeconfig $PRJ_ROOT/.kube/us-east-2
         kubectl config use-context $K8S_USER --kubeconfig $PRJ_ROOT/.kube/eu-central-1
-        chmod 600 $PRJ_ROOT/.kube/*
       '';
     };
   };

diff --git a/.kube/eu-central-1 → nix/local/kubeconfig/eu-central-1 b/.kube/eu-central-1 → nix/local/kubeconfig/eu-central-1
@@ -41,9 +41,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-admin
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: eks-devs
@@ -62,9 +60,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-devs
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: eks-readonly
@@ -83,9 +79,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-readonly
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: lace-ci
@@ -104,8 +98,6 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/lace-ci
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
diff --git a/.kube/us-east-1 → nix/local/kubeconfig/us-east-1 b/.kube/us-east-1 → nix/local/kubeconfig/us-east-1
@@ -41,9 +41,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-admin
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: eks-devs
@@ -62,9 +60,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-devs
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: eks-readonly
@@ -83,9 +79,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-readonly
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: lace-ci
@@ -104,8 +98,6 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/lace-ci
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
diff --git a/.kube/us-east-2 → nix/local/kubeconfig/us-east-2 b/.kube/us-east-2 → nix/local/kubeconfig/us-east-2
@@ -41,9 +41,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-admin
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: eks-devs
@@ -62,9 +60,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-devs
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: eks-readonly
@@ -83,9 +79,7 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/eks-readonly
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false
 - name: lace-ci
@@ -104,8 +98,6 @@ users:
       - --role
       - arn:aws:iam::926093910549:role/lace-ci
       command: aws
-      env:
-      - name: AWS_PROFILE
-        value: lw
+      env: null
       interactiveMode: IfAvailable
       provideClusterInfo: false