File tree 2 files changed +2
-10
lines changed
2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -10,12 +10,6 @@ set +e
10
10
WORKINGDIR=" ${GOPATH} /src/github.com/UKHomeOffice/keto"
11
11
KETO_ASSETS_DIR=${KETO_ASSETS_DIR:- ${PWD} }
12
12
13
- function generate_kube_config() {
14
- API_ADDR=" https://$( aws cloudformation describe-stacks --stack-name keto-${CLUSTER_NAME} -elb --query " Stacks[0].Outputs[?OutputKey=='ELBDNS'].OutputValue" --output text) "
15
- mkdir -p ~ /.kube/
16
- kubeadm alpha phase kubeconfig client-certs --client-name kubernetes-admin --organization system:masters --server ${API_ADDR} --cert-dir ${KETO_ASSETS_DIR} > ~ /.kube/config
17
- }
18
-
19
13
function cleanup() {
20
14
echo " [INFO] Attempting to delete keto cluster '${CLUSTER_NAME} '"
21
15
keto --cloud ${KETO_CLOUD_PROVIDER} delete cluster ${CLUSTER_NAME}
@@ -33,7 +27,8 @@ function run_e2e_test() {
33
27
34
28
# TODO: Modify once Keto adds capability to auto generate config using the client cli
35
29
echo " [INFO] Generating Kubernetes config"
36
- generate_kube_config || return
30
+ mkdir -p ~ /.kube
31
+ keto get config --cloud aws --cluster ${CLUSTER_NAME} --assets-dir ${KETO_ASSETS_DIR} --output-file ~ /.kube/config || return
37
32
38
33
echo " [INFO] Executing kuberang test to validate cluster health"
39
34
${WORKINGDIR} /bin/kuberang.sh 180 || return
Original file line number Diff line number Diff line change @@ -13,9 +13,6 @@ glide install
13
13
# cfssl for cert generation
14
14
go get -u github.com/cloudflare/cfssl/cmd/...
15
15
16
- # TODO: This can be removed when keto implements the capability to locally generate the kube config
17
- curl -LO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && pip install awscli
18
-
19
16
# Get kubectl, kubeadm, kuberang
20
17
curl -LO https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION} /bin/linux/amd64/kubectl
21
18
chmod +x kubectl && mv kubectl /usr/local/bin/kubectl && kubectl help
You can’t perform that action at this time.
0 commit comments