Skip to content

Commit cb86a51

Browse files
authored
Merge pull request #1210 from damdo/bump-cert-manager
Bump cert-manager to v1.14.4 to align with CAPI
2 parents b78ae5b + a9b955e commit cb86a51

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ GOTESTSUM_VER := v1.6.4
110110
GOTESTSUM_BIN := gotestsum
111111
GOTESTSUM := $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)
112112

113+
# Other tools versions
114+
CERT_MANAGER_VER := v1.14.4
115+
113116
# Define Docker related variables. Releases should modify and double check these vars.
114117
export GCP_PROJECT ?= $(shell gcloud config get-value project)
115118
REGISTRY ?= gcr.io/$(GCP_PROJECT)
@@ -461,7 +464,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KIND) $(KUBECTL)
461464
$(KIND) create cluster --name=clusterapi
462465

463466
# Install cert manager and wait for availability
464-
./hack/install-cert-manager.sh
467+
./hack/install-cert-manager.sh $(CERT_MANAGER_VER)
465468

466469
# Deploy CAPI
467470
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ settings = {
1919
"preload_images_for_kind": True,
2020
"kind_cluster_name": "capg",
2121
"capi_version": "v1.7.0",
22-
"cert_manager_version": "v1.11.0",
22+
"cert_manager_version": "v1.14.4",
2323
"kubernetes_version": "v1.29.3",
2424
}
2525

hack/install-cert-manager.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21+
CERT_MANAGER_VERSION=${1}
22+
2123
TEST_RESOURCE=$(cat <<-END
2224
apiVersion: v1
2325
kind: Namespace
@@ -52,7 +54,7 @@ KUBECTL="${REPO_ROOT}/hack/tools/bin/kubectl"
5254
cd "${REPO_ROOT}" && make "${KUBECTL##*/}"
5355

5456
## Install cert manager and wait for availability
55-
"${KUBECTL}" apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.11.0/cert-manager.yaml
57+
"${KUBECTL}" apply -f "https://github.com/cert-manager/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml"
5658
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager
5759
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector
5860
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook

0 commit comments

Comments
 (0)