Skip to content

Commit 131e8e1

Browse files
chickenbeefdims
authored andcommitted
Remove CSR logic from Makefile
1 parent b6d115f commit 131e8e1

File tree

3 files changed

+2
-31
lines changed

3 files changed

+2
-31
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
*.swp
22
.idea
33
amazon-eks-pod-identity-webhook
4-
deploy/mutatingwebhook-ca-bundle.yaml
54
deploy/deployment.yaml
65
build
76
/certs/

Makefile

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,21 @@ cluster-up: deploy-config
7070
cluster-down: delete-config
7171

7272
prep-config:
73-
@echo 'Generating certs and deploying into active cluster...'
73+
@echo 'Deploying into active cluster...'
7474
cat deploy/deployment-base.yaml | sed -e "s|IMAGE|${IMAGE}|g" | tee deploy/deployment.yaml
75-
cat deploy/mutatingwebhook.yaml | hack/webhook-patch-ca-bundle.sh > deploy/mutatingwebhook-ca-bundle.yaml
7675

7776
deploy-config: prep-config
7877
@echo 'Applying configuration to active cluster...'
7978
kubectl apply -f deploy/auth.yaml
8079
kubectl apply -f deploy/deployment.yaml
8180
kubectl apply -f deploy/service.yaml
82-
kubectl apply -f deploy/mutatingwebhook-ca-bundle.yaml
83-
until kubectl get csr -o \
84-
jsonpath='{.items[?(@.spec.username=="system:serviceaccount:default:pod-identity-webhook")].metadata.name}' | \
85-
grep -m 1 "csr-"; \
86-
do echo "Waiting for CSR to be created" && sleep 1 ; \
87-
done
88-
kubectl certificate approve $$(kubectl get csr -o jsonpath='{.items[?(@.spec.username=="system:serviceaccount:default:pod-identity-webhook")].metadata.name}')
8981

9082
delete-config:
9183
@echo 'Tearing down mutating controller and associated resources...'
92-
kubectl delete -f deploy/mutatingwebhook-ca-bundle.yaml
9384
kubectl delete -f deploy/service.yaml
9485
kubectl delete -f deploy/deployment.yaml
9586
kubectl delete -f deploy/auth.yaml
96-
kubectl delete secret pod-identity-webhook
87+
kubectl delete secret pod-identity-webhook-cert
9788

9889
clean::
9990
rm -rf ./amazon-eks-pod-identity-webhook

hack/webhook-patch-ca-bundle.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)