Skip to content

Commit 27938a2

Browse files
committed
chore(ci): move cert-manager install to makefile
1 parent ca4078c commit 27938a2

2 files changed

Lines changed: 25 additions & 22 deletions

File tree

.github/workflows/_reusable-e2e.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,6 @@ jobs:
4949
with:
5050
version: 1.36.2
5151

52-
- name: Install cert-manager
53-
run: |
54-
helm repo add jetstack https://charts.jetstack.io
55-
helm upgrade --install cert-manager jetstack/cert-manager \
56-
--namespace cert-manager --create-namespace \
57-
--version v1.20.3 \
58-
--set crds.enabled=true
59-
kubectl wait --namespace cert-manager --for=condition=Available deployment cert-manager --timeout=180s
60-
kubectl wait --namespace cert-manager --for=condition=Available deployment cert-manager-webhook --timeout=180s
61-
62-
- name: Create e2e ClusterIssuer for webhook test
63-
run: |
64-
kubectl apply -f - <<EOF
65-
apiVersion: cert-manager.io/v1
66-
kind: ClusterIssuer
67-
metadata:
68-
name: e2e-selfsigned
69-
spec:
70-
selfSigned: {}
71-
EOF
72-
7352
- name: Deploy CSI driver via Helm
7453
run: |
7554
make deploy-test \

Makefile

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,34 @@ helm-deploy:
2626
$(if $(HELM_VALUES),--values $(HELM_VALUES),) \
2727
$(HELM_OPTS) --wait --timeout 180s
2828

29+
CERT_MANAGER_VERSION ?= v1.20.3
30+
31+
.PHONY: install-cert-manager
32+
install-cert-manager:
33+
helm repo add jetstack https://charts.jetstack.io
34+
helm upgrade --install cert-manager jetstack/cert-manager \
35+
--namespace cert-manager --create-namespace \
36+
--version $(CERT_MANAGER_VERSION) \
37+
--set crds.enabled=true
38+
kubectl wait --namespace cert-manager --for=condition=Available deployment cert-manager --timeout=180s
39+
kubectl wait --namespace cert-manager --for=condition=Available deployment cert-manager-webhook --timeout=180s
40+
41+
.PHONY: create-e2e-clusterissuer
42+
create-e2e-clusterissuer:
43+
kubectl apply -f - <<EOF
44+
apiVersion: cert-manager.io/v1
45+
kind: ClusterIssuer
46+
metadata:
47+
name: e2e-selfsigned
48+
spec:
49+
selfSigned: {}
50+
EOF
51+
2952
.PHONY: deploy-test
30-
deploy-test:
53+
deploy-test: install-cert-manager create-e2e-clusterissuer
3154
helm upgrade --install upcloud-csi $(HELM_CHART_DIR) --namespace kube-system \
3255
--set networkPolicy.enabled=true \
56+
--set clusterZone=de-fra1 \
3357
$(if $(HELM_VALUES),--values $(HELM_VALUES),) \
3458
$(HELM_OPTS) --wait --timeout 180s
3559

0 commit comments

Comments
 (0)