Skip to content

Commit 1128301

Browse files
committed
ci: Refactor cert-manager install to be direct heml without caching resources
1 parent ed5fa7a commit 1128301

5 files changed

Lines changed: 9 additions & 14251 deletions

File tree

hack/update-codegen.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,3 @@ if ! ${GITHUB_ACTIONS:-false}; then
8383
fi
8484

8585
"${REPO_ROOT_DIR}"/hack/update-deps.sh
86-
87-
cert_manager_installer="${REPO_ROOT_DIR}/vendor/knative.dev/eventing/hack/update-cert-manager.sh"
88-
89-
bash "${cert_manager_installer}"

test/e2e-common.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ readonly LATEST_RELEASE_VERSION=$(latest_version)
4040
readonly PREVIOUS_RELEASE_URL="${PREVIOUS_RELEASE_URL:-"https://github.com/knative-extensions/eventing-kafka-broker/releases/download/${LATEST_RELEASE_VERSION}"}"
4141

4242
readonly EVENTING_CONFIG=${EVENTING_CONFIG:-"./third_party/eventing-latest/"}
43-
readonly CERTMANAGER_CONFIG=${CERTMANAGER_CONFIG:-"./third_party/cert-manager"}
43+
readonly CERTMANAGER_VERSION=${CERTMANAGER_VERSION:-""}
44+
readonly TRUSTMANAGER_VERSION=${TRUSTMANAGER_VERSION:-""}
4445

4546
# Vendored eventing test images.
4647
readonly VENDOR_EVENTING_TEST_IMAGES="vendor/knative.dev/eventing/test/test_images/"
@@ -104,13 +105,13 @@ function install_eventing_core() {
104105

105106
function knative_eventing() {
106107
# we need cert-manager installed to be able to create the issuers
107-
kubectl apply -f "${CERTMANAGER_CONFIG}/00-namespace.yaml"
108-
109-
timeout 600 bash -c "until kubectl apply -f ${CERTMANAGER_CONFIG}/01-cert-manager.yaml; do sleep 5; done"
110-
wait_until_pods_running "cert-manager" || fail_test "Failed to install cert manager"
111-
112-
timeout 600 bash -c "until kubectl apply -f ${CERTMANAGER_CONFIG}/02-trust-manager.yaml; do sleep 5; done"
113-
wait_until_pods_running "cert-manager" || fail_test "Failed to install trust manager"
108+
helm repo add jetstack https://charts.jetstack.io --force-update
109+
helm upgrade --install cert-manager jetstack/cert-manager \
110+
--namespace cert-manager --create-namespace --set crds.enabled=true --wait --timeout 10m \
111+
${CERTMANAGER_VERSION:+--version ${CERTMANAGER_VERSION}}
112+
helm upgrade --install trust-manager jetstack/trust-manager \
113+
--namespace cert-manager --set crds.enabled=true --wait --timeout 10m \
114+
${TRUSTMANAGER_VERSION:+--version ${TRUSTMANAGER_VERSION}}
114115

115116
install_eventing_core
116117

third_party/cert-manager/00-namespace.yaml

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

0 commit comments

Comments
 (0)