Skip to content

Commit a0285da

Browse files
authored
Merge pull request #453 from jackfrancis/cert-manager-dependencies
don’t deliver cert-manager CRDs with cluster-api-operator chart
2 parents ee252ac + c8a9022 commit a0285da

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ release-manifests: $(KUSTOMIZE) $(RELEASE_DIR) ## Builds the manifests to publis
476476
release-chart: $(HELM) $(KUSTOMIZE) $(RELEASE_DIR) $(CHART_DIR) $(CHART_PACKAGE_DIR) ## Builds the chart to publish with a release
477477
cp -rf $(ROOT)/hack/charts/cluster-api-operator/. $(CHART_DIR)
478478
$(KUSTOMIZE) build ./config/chart > $(CHART_DIR)/templates/operator-components.yaml
479-
$(ROOT)/hack/inject-cert-manager-helm.sh $(CERT_MANAGER_VERSION)
479+
$(ROOT)/hack/inject-cert-manager-chart-version.sh $(CERT_MANAGER_VERSION)
480480
$(HELM) package $(CHART_DIR) --app-version=$(HELM_CHART_TAG) --version=$(HELM_CHART_TAG) --destination=$(CHART_PACKAGE_DIR)
481481

482482
.PHONY: release-staging

hack/charts/cluster-api-operator/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cert-manager:
55
enabled: false
66
fullnameOverride: "cert-manager"
77
namespace: "cert-manager"
8+
installCRDs: true
89
# ---
910
# Cluster API provider options
1011
core: ""

hack/inject-cert-manager-helm.sh renamed to hack/inject-cert-manager-chart-version.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,9 @@ if [[ ! "$1" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
3232
fi
3333

3434
VERSION=$1
35-
URL="https://github.com/cert-manager/cert-manager/releases/download/${VERSION}/cert-manager.crds.yaml"
36-
OUTPUT_DIR="${CHART_DIR}/crds"
3735

3836
# Create the output directory if it doesn't exist
39-
mkdir -p "$OUTPUT_DIR"
40-
41-
# Download and save the file
42-
curl -L -o "${OUTPUT_DIR}/cert-manager.crds.yaml" "$URL"
43-
echo "Downloaded cert-manager.crds.yaml for ${VERSION} and saved it in ${OUTPUT_DIR}"
37+
mkdir -p "$CHART_DIR"
4438

4539
# Modify version in Chart.yaml
4640
CHART_FILE="${CHART_DIR}/Chart.yaml"

0 commit comments

Comments
 (0)