Skip to content

Commit e644619

Browse files
authored
Merge pull request #521 from Fedosin/helm_no_cert_manager
⚠️ remove cert-manager support from helm chart
2 parents cc612a3 + 4123e88 commit e644619

File tree

13 files changed

+28
-107
lines changed

13 files changed

+28
-107
lines changed

Makefile

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

486485
.PHONY: release-staging

docs/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,21 @@ The lexicon used in this document is described in more detail [here](https://git
5757

5858
## Installation
5959

60-
### Method 1: Apply Manifests from Release Assets
60+
### Prerequisites
6161

62-
Before installing the Cluster API Operator this way, you must first ensure that cert-manager is installed, as the operator does not manage cert-manager installations. To install cert-manager, run the following command:
62+
Before installing the Cluster API Operator, you must first ensure that cert-manager is installed, as the operator does not manage cert-manager installations. To install cert-manager, run the following command:
6363

6464
```bash
6565
kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml
6666
```
6767

6868
Wait for cert-manager to be ready before proceeding.
6969

70-
After cert-manager is successfully installed, you can install the Cluster API operator directly by applying the latest release assets:
70+
After cert-manager is successfully installed, you can proceed installing the Cluster API operator.
71+
72+
### Method 1: Apply Manifests from Release Assets
73+
74+
You can install the Cluster API operator directly by applying the latest release assets:
7175

7276
```bash
7377
kubectl apply -f https://github.com/kubernetes-sigs/cluster-api-operator/releases/latest/download/operator-components.yaml
@@ -83,10 +87,6 @@ helm repo update
8387
helm install capi-operator capi-operator/cluster-api-operator --create-namespace -n capi-operator-system
8488
```
8589

86-
#### Installing cert-manager using Helm chart
87-
88-
CAPI operator Helm chart supports provisioning of cert-manager as a dependency. It is disabled by default, but you can enable it with `--set cert-manager.enabled=true` option to `helm install` command or inside of `cert-manager` section in [values.yaml](https://github.com/kubernetes-sigs/cluster-api-operator/blob/main/hack/charts/cluster-api-operator/values.yaml) file. Additionally you can define other [parameters](https://artifacthub.io/packages/helm/cert-manager/cert-manager#configuration) provided by the cert-manager chart.
89-
9090
#### Installing providers using Helm chart
9191

9292
The operator Helm chart supports a "quickstart" option for bootstrapping a management cluster. The user experience is relatively similar to [clusterctl init](https://cluster-api.sigs.k8s.io/clusterctl/commands/init.html?highlight=init#clusterctl-init):

docs/book/src/01_user/02_quick-start.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ For more detailed information, please refer to the full documentation.
88

99
- [Running Kubernetes cluster](https://cluster-api.sigs.k8s.io/user/quick-start#install-andor-configure-a-kubernetes-cluster).
1010
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) for interacting with the management cluster.
11+
- [Cert Manager](https://cert-manager.io/docs/installation/) for managing operator certificates.
1112
- [Helm](https://helm.sh/docs/intro/install/) for installing operator on the cluster (optional).
1213

1314
## Install and configure Cluster API Operator
@@ -37,7 +38,7 @@ helm repo update
3738
Deploy Cluster API components with docker provider using a single command during operator installation
3839

3940
```bash
40-
helm install capi-operator capi-operator/cluster-api-operator --create-namespace -n capi-operator-system --set infrastructure=docker --set cert-manager.enabled=true --set configSecret.name=${CREDENTIALS_SECRET_NAME} --set configSecret.namespace=${CREDENTIALS_SECRET_NAMESPACE} --wait --timeout 90s
41+
helm install capi-operator capi-operator/cluster-api-operator --create-namespace -n capi-operator-system --set infrastructure=docker --set configSecret.name=${CREDENTIALS_SECRET_NAME} --set configSecret.namespace=${CREDENTIALS_SECRET_NAMESPACE} --wait --timeout 90s
4142
```
4243

4344
Docker provider can be replaced by any provider supported by [clusterctl](https://cluster-api.sigs.k8s.io/reference/providers.html#infrastructure).
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Prerequisites
2+
3+
Before installing the Cluster API Operator, you must first ensure that cert-manager is installed, as the operator does not manage cert-manager installations. To install cert-manager, run the following command:
4+
5+
```bash
6+
kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml
7+
```
8+
9+
Wait for cert-manager to be ready before proceeding.
10+
11+
After cert-manager is successfully installed, you can proceed installing the Cluster API operator.

docs/book/src/02_installation/02_manifest-installation.md

Lines changed: 0 additions & 15 deletions
This file was deleted.
File renamed without changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Using Manifests from Release Assets
2+
3+
You can install the Cluster API operator directly by applying the latest release assets:
4+
5+
```bash
6+
kubectl apply -f https://github.com/kubernetes-sigs/cluster-api-operator/releases/latest/download/operator-components.yaml
7+
```

docs/book/src/02_installation/03_helm-chart-installation.md renamed to docs/book/src/02_installation/04_helm-chart-installation.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ helm repo update
88
helm install capi-operator capi-operator/cluster-api-operator --create-namespace -n capi-operator-system
99
```
1010

11-
#### Installing cert-manager using Helm chart
12-
13-
CAPI operator Helm chart supports provisioning of cert-manager as a dependency. It is disabled by default, but you can enable it with `--set cert-manager.enabled=true` option to `helm install` command or inside of `cert-manager` section in [values.yaml](https://github.com/kubernetes-sigs/cluster-api-operator/blob/main/hack/charts/cluster-api-operator/values.yaml) file. Additionally you can define other [parameters](https://artifacthub.io/packages/helm/cert-manager/cert-manager#configuration) provided by the cert-manager chart.
14-
1511
#### Installing providers using Helm chart
1612

1713
The operator Helm chart supports a "quickstart" option for bootstrapping a management cluster. The user experience is relatively similar to [clusterctl init](https://cluster-api.sigs.k8s.io/clusterctl/commands/init.html?highlight=init#clusterctl-init):

docs/book/src/04_developer/02_guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/
6767
Ensure the cert-manager webhook service is ready before creating the Cluster API Operator components.
6868

6969
This can be done by following instructions for [manual verification](https://cert-manager.io/docs/installation/verify/#manual-verification)
70-
from the [cert-manager] web site.
70+
from the [cert-manager] website.
7171
Note: make sure to follow instructions for the release of cert-manager you are installing.
7272

7373
[cert-manager]: https://github.com/cert-manager/cert-manager

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,3 @@ description: Cluster API Operator
44
type: application
55
version: 0.0.0
66
appVersion: "0.0.0"
7-
dependencies:
8-
- name: cert-manager
9-
version: "0.0.0"
10-
repository: https://charts.jetstack.io
11-
condition: cert-manager.enabled

0 commit comments

Comments
 (0)