Skip to content

Commit 2a46b5d

Browse files
Merge pull request #1373 from input-output-hk/kubeconfig-improvements
chore: remove kubeconfig dependency on ~/.aws/credentials
2 parents 16d7d0a + 66a4293 commit 2a46b5d

File tree

5 files changed

+18
-37
lines changed

5 files changed

+18
-37
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ source
3636
/.data
3737
/.config
3838
/.local
39+
40+
# Auto generated
41+
.kube

nix/local/envs.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,12 @@
6060

6161
devshell.startup.setup.text = ''
6262
[ -e $PRJ_ROOT/.envrc.local ] && source $PRJ_ROOT/.envrc.local
63+
rm -rf $PRJ_ROOT/.kube
64+
cp -R $PRJ_ROOT/nix/local/kubeconfig $PRJ_ROOT/.kube
65+
chmod 600 $PRJ_ROOT/.kube/*
6366
kubectl config use-context $K8S_USER
6467
kubectl config use-context $K8S_USER --kubeconfig $PRJ_ROOT/.kube/us-east-2
6568
kubectl config use-context $K8S_USER --kubeconfig $PRJ_ROOT/.kube/eu-central-1
66-
chmod 600 $PRJ_ROOT/.kube/*
6769
'';
6870
};
6971
};

.kube/eu-central-1 renamed to nix/local/kubeconfig/eu-central-1

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ users:
4141
- --role
4242
- arn:aws:iam::926093910549:role/eks-admin
4343
command: aws
44-
env:
45-
- name: AWS_PROFILE
46-
value: lw
44+
env: null
4745
interactiveMode: IfAvailable
4846
provideClusterInfo: false
4947
- name: eks-devs
@@ -62,9 +60,7 @@ users:
6260
- --role
6361
- arn:aws:iam::926093910549:role/eks-devs
6462
command: aws
65-
env:
66-
- name: AWS_PROFILE
67-
value: lw
63+
env: null
6864
interactiveMode: IfAvailable
6965
provideClusterInfo: false
7066
- name: eks-readonly
@@ -83,9 +79,7 @@ users:
8379
- --role
8480
- arn:aws:iam::926093910549:role/eks-readonly
8581
command: aws
86-
env:
87-
- name: AWS_PROFILE
88-
value: lw
82+
env: null
8983
interactiveMode: IfAvailable
9084
provideClusterInfo: false
9185
- name: lace-ci
@@ -104,8 +98,6 @@ users:
10498
- --role
10599
- arn:aws:iam::926093910549:role/lace-ci
106100
command: aws
107-
env:
108-
- name: AWS_PROFILE
109-
value: lw
101+
env: null
110102
interactiveMode: IfAvailable
111103
provideClusterInfo: false

.kube/us-east-1 renamed to nix/local/kubeconfig/us-east-1

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ users:
4141
- --role
4242
- arn:aws:iam::926093910549:role/eks-admin
4343
command: aws
44-
env:
45-
- name: AWS_PROFILE
46-
value: lw
44+
env: null
4745
interactiveMode: IfAvailable
4846
provideClusterInfo: false
4947
- name: eks-devs
@@ -62,9 +60,7 @@ users:
6260
- --role
6361
- arn:aws:iam::926093910549:role/eks-devs
6462
command: aws
65-
env:
66-
- name: AWS_PROFILE
67-
value: lw
63+
env: null
6864
interactiveMode: IfAvailable
6965
provideClusterInfo: false
7066
- name: eks-readonly
@@ -83,9 +79,7 @@ users:
8379
- --role
8480
- arn:aws:iam::926093910549:role/eks-readonly
8581
command: aws
86-
env:
87-
- name: AWS_PROFILE
88-
value: lw
82+
env: null
8983
interactiveMode: IfAvailable
9084
provideClusterInfo: false
9185
- name: lace-ci
@@ -104,8 +98,6 @@ users:
10498
- --role
10599
- arn:aws:iam::926093910549:role/lace-ci
106100
command: aws
107-
env:
108-
- name: AWS_PROFILE
109-
value: lw
101+
env: null
110102
interactiveMode: IfAvailable
111103
provideClusterInfo: false

.kube/us-east-2 renamed to nix/local/kubeconfig/us-east-2

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ users:
4141
- --role
4242
- arn:aws:iam::926093910549:role/eks-admin
4343
command: aws
44-
env:
45-
- name: AWS_PROFILE
46-
value: lw
44+
env: null
4745
interactiveMode: IfAvailable
4846
provideClusterInfo: false
4947
- name: eks-devs
@@ -62,9 +60,7 @@ users:
6260
- --role
6361
- arn:aws:iam::926093910549:role/eks-devs
6462
command: aws
65-
env:
66-
- name: AWS_PROFILE
67-
value: lw
63+
env: null
6864
interactiveMode: IfAvailable
6965
provideClusterInfo: false
7066
- name: eks-readonly
@@ -83,9 +79,7 @@ users:
8379
- --role
8480
- arn:aws:iam::926093910549:role/eks-readonly
8581
command: aws
86-
env:
87-
- name: AWS_PROFILE
88-
value: lw
82+
env: null
8983
interactiveMode: IfAvailable
9084
provideClusterInfo: false
9185
- name: lace-ci
@@ -104,8 +98,6 @@ users:
10498
- --role
10599
- arn:aws:iam::926093910549:role/lace-ci
106100
command: aws
107-
env:
108-
- name: AWS_PROFILE
109-
value: lw
101+
env: null
110102
interactiveMode: IfAvailable
111103
provideClusterInfo: false

0 commit comments

Comments
 (0)