Skip to content

Commit

Permalink
Remove cert manager from kuttl tests (#182)
Browse files Browse the repository at this point in the history
  • Loading branch information
nolancon authored Mar 27, 2024
1 parent e1240e1 commit 72cb2b2
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 47 deletions.
1 change: 0 additions & 1 deletion .github/workflows/kuttl-e2e-test-1.26.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
- name: Run kuttl tests 1.26
run: make kuttl
env:
WEBHOOK_TYPE: 'cert-manager'
LATEST_KUBE_VERSION: '1.26'
AWS_ACCESS_KEY_ID: 'Dummy'
AWS_SECRET_ACCESS_KEY: 'Dummy'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/kuttl-e2e-test-1.27.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
- name: Run kuttl tests 1.27
run: make kuttl
env:
WEBHOOK_TYPE: 'cert-manager'
LATEST_KUBE_VERSION: '1.27'
AWS_ACCESS_KEY_ID: 'Dummy'
AWS_SECRET_ACCESS_KEY: 'Dummy'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/kuttl-e2e-test-1.28.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
- name: Run kuttl tests 1.28
run: make kuttl
env:
WEBHOOK_TYPE: 'cert-manager'
LATEST_KUBE_VERSION: '1.28'
AWS_ACCESS_KEY_ID: 'Dummy'
AWS_SECRET_ACCESS_KEY: 'Dummy'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/kuttl-e2e-test-1.29.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
- name: Run kuttl tests 1.29
run: make kuttl
env:
WEBHOOK_TYPE: 'cert-manager'
LATEST_KUBE_VERSION: '1.29'
AWS_ACCESS_KEY_ID: 'Dummy'
AWS_SECRET_ACCESS_KEY: 'Dummy'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ load-package: $(KIND) build kustomize-webhook
# to the Provider.
# Run Kuttl test suite on newly built controller image.
# Destroy Kind and localstack.
kuttl: $(KUTTL) generate-pkg generate-tests crossplane-cluster localstack-cluster cert-manager load-package
kuttl: $(KUTTL) generate-pkg generate-tests crossplane-cluster localstack-cluster load-package
@$(INFO) Running kuttl test suite
@$(KUTTL) test --config e2e/kuttl/stable/provider-ceph-$(LATEST_KUBE_VERSION).yaml
@$(OK) Running kuttl test suite
Expand Down
4 changes: 0 additions & 4 deletions e2e/tests/stable/provider-ceph/00-enable-webhook.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions hack/deploy-provider.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,6 @@
: "${ARCH?= required}"
: "${VERSION?= required}"

# Apply cert-manager Issuer and Certificate
kubectl apply -f - <<EOF
apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
name: selfsigned-issuer
namespace: crossplane-system
spec:
selfSigned: {}
---
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: crossplane-provider-provider-ceph
namespace: crossplane-system
spec:
commonName: provider-ceph.crossplane-system.svc
dnsNames:
- provider-ceph.crossplane-system.svc.cluster.local
- provider-ceph.crossplane-system.svc
- crossplane-provider-provider-ceph.crossplane-system.svc.cluster.local
- crossplane-provider-provider-ceph.crossplane-system.svc
issuerRef:
kind: Issuer
name: selfsigned-issuer
secretName: crossplane-provider-provider-ceph-server-cert
EOF

# Apply a configuration for the provider deployment.
kubectl apply -f - <<EOF
apiVersion: pkg.crossplane.io/v1beta1
Expand Down Expand Up @@ -60,14 +32,6 @@ spec:
- --poll=30m
- --sync=1h
- --assume-role-arn=${ASSUME_ROLE_ARN}
- --webhook-tls-cert-dir=/certs
volumeMounts:
- name: cert-manager-certs
mountPath: /certs
volumes:
- name: cert-manager-certs
secret:
secretName: crossplane-provider-provider-ceph-server-cert
EOF

# Apply the provider.
Expand Down
2 changes: 0 additions & 2 deletions hack/generate-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
: "${TEST_KIND_NODES?= required}"
: "${REPO?= required}"
: "${LOCALSTACK_VERSION?= required}"
: "${CERT_MANAGER_VERSION?= required}"

# This script reads a comma-delimited string TEST_KIND_NODES of kind node versions
# for kuttl tests to be run on, and generates the relevant files for each version.
Expand Down Expand Up @@ -122,7 +121,6 @@ jobs:
- name: Run kuttl tests ${major}
run: make kuttl
env:
WEBHOOK_TYPE: 'cert-manager'
LATEST_KUBE_VERSION: '${major}'
AWS_ACCESS_KEY_ID: 'Dummy'
AWS_SECRET_ACCESS_KEY: 'Dummy'
Expand Down

0 comments on commit 72cb2b2

Please sign in to comment.