Skip to content

Commit 613ebf5

Browse files
authored
Merge pull request #881 from jbw976/helm-values-sync
Sync helm chart config values from crossplane/crossplane repo
2 parents b8da5af + dade061 commit 613ebf5

File tree

5 files changed

+95
-62
lines changed

5 files changed

+95
-62
lines changed

content/master/software/install.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,24 +125,27 @@ Apply customizations with the command line or with a Helm _values_ file.
125125
| `customAnnotations` | Add custom `annotations` to the Crossplane pod deployment. | `{}` |
126126
| `customLabels` | Add custom `labels` to the Crossplane pod deployment. | `{}` |
127127
| `deploymentStrategy` | The deployment strategy for the Crossplane and RBAC Manager pods. | `"RollingUpdate"` |
128+
| `dnsPolicy` | Specify the `dnsPolicy` to be used by the Crossplane pod. | `""` |
128129
| `extraEnvVarsCrossplane` | Add custom environmental variables to the Crossplane pod deployment. Replaces any `.` in a variable name with `_`. For example, `SAMPLE.KEY=value1` becomes `SAMPLE_KEY=value1`. | `{}` |
129130
| `extraEnvVarsRBACManager` | Add custom environmental variables to the RBAC Manager pod deployment. Replaces any `.` in a variable name with `_`. For example, `SAMPLE.KEY=value1` becomes `SAMPLE_KEY=value1`. | `{}` |
130131
| `extraObjects` | To add arbitrary Kubernetes Objects during a Helm Install | `[]` |
131132
| `extraVolumeMountsCrossplane` | Add custom `volumeMounts` to the Crossplane pod. | `{}` |
132133
| `extraVolumesCrossplane` | Add custom `volumes` to the Crossplane pod. | `{}` |
133-
| `function.packages` | A list of Function packages to install. | `[]` |
134-
| `hostNetwork` | Enable `hostNetwork` for the Crossplane deployment. Caution: enabling `hostNetwork` grants the Crossplane Pod access to the host network namespace. | `false` |
134+
| `function.packages` | A list of Function packages to install | `[]` |
135+
| `hostNetwork` | Enable `hostNetwork` for the Crossplane deployment. Caution: enabling `hostNetwork` grants the Crossplane Pod access to the host network namespace. Consider setting `dnsPolicy` to `ClusterFirstWithHostNet`. | `false` |
135136
| `image.pullPolicy` | The image pull policy used for Crossplane and RBAC Manager pods. | `"IfNotPresent"` |
136137
| `image.repository` | Repository for the Crossplane pod image. | `"xpkg.crossplane.io/crossplane/crossplane"` |
137138
| `image.tag` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. | `""` |
138-
| `imagePullSecrets` | The imagePullSecret names to add to the Crossplane ServiceAccount. | `{}` |
139+
| `imagePullSecrets` | The imagePullSecret names to add to the Crossplane ServiceAccount. | `[]` |
139140
| `leaderElection` | Enable [leader election](https://docs.crossplane.io/latest/concepts/pods/#leader-election) for the Crossplane pod. | `true` |
140141
| `metrics.enabled` | Enable Prometheus path, port and scrape annotations and expose port 8080 for both the Crossplane and RBAC Manager pods. | `false` |
142+
| `metrics.port` | The port the metrics server listens on. | `""` |
141143
| `nodeSelector` | Add `nodeSelectors` to the Crossplane pod deployment. | `{}` |
142144
| `packageCache.configMap` | The name of a ConfigMap to use as the package cache. Disables the default package cache `emptyDir` Volume. | `""` |
143145
| `packageCache.medium` | Set to `Memory` to hold the package cache in a RAM backed file system. Useful for Crossplane development. | `""` |
144146
| `packageCache.pvc` | The name of a PersistentVolumeClaim to use as the package cache. Disables the default package cache `emptyDir` Volume. | `""` |
145147
| `packageCache.sizeLimit` | The size limit for the package cache. If medium is `Memory` the `sizeLimit` can't exceed Node memory. | `"20Mi"` |
148+
| `packageManager.enableAutomaticDependencyDowngrade` | Enable automatic dependency version downgrades. This configuration is only used when `--enable-dependency-version-upgrades` flag is passed. | `false` |
146149
| `podSecurityContextCrossplane` | Add a custom `securityContext` to the Crossplane pod. | `{}` |
147150
| `podSecurityContextRBACManager` | Add a custom `securityContext` to the RBAC Manager pod. | `{}` |
148151
| `priorityClassName` | The PriorityClass name to apply to the Crossplane and RBAC Manager pods. | `""` |
@@ -153,20 +156,23 @@ Apply customizations with the command line or with a Helm _values_ file.
153156
| `rbacManager.leaderElection` | Enable [leader election](https://docs.crossplane.io/latest/concepts/pods/#leader-election) for the RBAC Manager pod. | `true` |
154157
| `rbacManager.nodeSelector` | Add `nodeSelectors` to the RBAC Manager pod deployment. | `{}` |
155158
| `rbacManager.replicas` | The number of RBAC Manager pod `replicas` to deploy. | `1` |
159+
| `rbacManager.revisionHistoryLimit` | The number of RBAC Manager ReplicaSets to retain. | `nil` |
156160
| `rbacManager.skipAggregatedClusterRoles` | Don't install aggregated Crossplane ClusterRoles. | `false` |
157161
| `rbacManager.tolerations` | Add `tolerations` to the RBAC Manager pod deployment. | `[]` |
158162
| `rbacManager.topologySpreadConstraints` | Add `topologySpreadConstraints` to the RBAC Manager pod deployment. | `[]` |
163+
| `readiness.port` | The port the readyz server listens on. | `""` |
159164
| `registryCaBundleConfig.key` | The ConfigMap key containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates. | `""` |
160165
| `registryCaBundleConfig.name` | The ConfigMap name containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates. | `""` |
161166
| `replicas` | The number of Crossplane pod `replicas` to deploy. | `1` |
162-
| `resourcesCrossplane.limits.cpu` | CPU resource limits for the Crossplane pod. | `"100m"` |
163-
| `resourcesCrossplane.limits.memory` | Memory resource limits for the Crossplane pod. | `"512Mi"` |
167+
| `resourcesCrossplane.limits.cpu` | CPU resource limits for the Crossplane pod. | `"500m"` |
168+
| `resourcesCrossplane.limits.memory` | Memory resource limits for the Crossplane pod. | `"1024Mi"` |
164169
| `resourcesCrossplane.requests.cpu` | CPU resource requests for the Crossplane pod. | `"100m"` |
165170
| `resourcesCrossplane.requests.memory` | Memory resource requests for the Crossplane pod. | `"256Mi"` |
166171
| `resourcesRBACManager.limits.cpu` | CPU resource limits for the RBAC Manager pod. | `"100m"` |
167172
| `resourcesRBACManager.limits.memory` | Memory resource limits for the RBAC Manager pod. | `"512Mi"` |
168173
| `resourcesRBACManager.requests.cpu` | CPU resource requests for the RBAC Manager pod. | `"100m"` |
169174
| `resourcesRBACManager.requests.memory` | Memory resource requests for the RBAC Manager pod. | `"256Mi"` |
175+
| `revisionHistoryLimit` | The number of Crossplane ReplicaSets to retain. | `nil` |
170176
| `securityContextCrossplane.allowPrivilegeEscalation` | Enable `allowPrivilegeEscalation` for the Crossplane pod. | `false` |
171177
| `securityContextCrossplane.readOnlyRootFilesystem` | Set the Crossplane pod root file system as read-only. | `true` |
172178
| `securityContextCrossplane.runAsGroup` | The group ID used by the Crossplane pod. | `65532` |
@@ -175,10 +181,14 @@ Apply customizations with the command line or with a Helm _values_ file.
175181
| `securityContextRBACManager.readOnlyRootFilesystem` | Set the RBAC Manager pod root file system as read-only. | `true` |
176182
| `securityContextRBACManager.runAsGroup` | The group ID used by the RBAC Manager pod. | `65532` |
177183
| `securityContextRBACManager.runAsUser` | The user ID used by the RBAC Manager pod. | `65532` |
184+
| `service.customAnnotations` | Configure annotations on the service object. Only enabled when webhooks.enabled = true | `{}` |
185+
| `serviceAccount.create` | Specifies whether Crossplane ServiceAccount should be created | `true` |
178186
| `serviceAccount.customAnnotations` | Add custom `annotations` to the Crossplane ServiceAccount. | `{}` |
187+
| `serviceAccount.name` | Provide the name of an already created Crossplane ServiceAccount. Required when `serviceAccount.create` is `false` | `""` |
179188
| `tolerations` | Add `tolerations` to the Crossplane pod deployment. | `[]` |
180189
| `topologySpreadConstraints` | Add `topologySpreadConstraints` to the Crossplane pod deployment. | `[]` |
181190
| `webhooks.enabled` | Enable webhooks for Crossplane and installed Provider packages. | `true` |
191+
| `webhooks.port` | The port the webhook server listens on. | `""` |
182192
{{< /table >}}
183193
{{< /expand >}}
184194
<!-- vale gitlab.Substitutions = YES -->

content/v1.17/software/install.md

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ helm repo update
3838
Install the Crossplane Helm chart with `helm install`.
3939

4040
{{< hint "tip" >}}
41-
View the changes Crossplane makes to your cluster with the
41+
View the changes Crossplane makes to your cluster with the
4242
`helm install --dry-run --debug` options. Helm shows what configurations it
4343
applies without making changes to the Kubernetes cluster.
4444
{{< /hint >}}
@@ -48,7 +48,7 @@ Crossplane creates and installs into the `crossplane-system` namespace.
4848
```shell
4949
helm install crossplane \
5050
--namespace crossplane-system \
51-
--create-namespace crossplane-stable/crossplane
51+
--create-namespace crossplane-stable/crossplane
5252
```
5353

5454
View the installed Crossplane pods with `kubectl get pods -n crossplane-system`.
@@ -75,7 +75,7 @@ helm install crossplane \
7575

7676
## Installed deployments
7777
Crossplane creates two Kubernetes _deployments_ in the `crossplane-system`
78-
namespace to deploy the Crossplane pods.
78+
namespace to deploy the Crossplane pods.
7979

8080
```shell {copy-lines="1"}
8181
kubectl get deployments -n crossplane-system
@@ -87,10 +87,10 @@ crossplane-rbac-manager 1/1 1 1 8m13s
8787
### Crossplane deployment
8888
The Crossplane deployment starts with the `crossplane-init container`. The
8989
`init` container installs the Crossplane _Custom Resource Definitions_ into the
90-
Kubernetes cluster.
90+
Kubernetes cluster.
9191

9292
After the `init` container finishes, the `crossplane` pod manages two Kubernetes
93-
controllers.
93+
controllers.
9494
* The _Package Manager controller_ installs the
9595
provider, function and configuration packages.
9696
* The _Composition controller_ installs and manages the
@@ -100,8 +100,8 @@ Crossplane _Composite Resource Definitions_, _Compositions_ and _Claims_.
100100
The `crossplane-rbac-manager` creates and manages Kubernetes _ClusterRoles_ for
101101
installed Crossplane _Provider_ and their _Custom Resource Definitions_.
102102

103-
The
104-
[Crossplane RBAC Manager design document](https://github.com/crossplane/crossplane/blob/main/design/design-doc-rbac-manager.md)
103+
The
104+
[Crossplane RBAC Manager design document](https://github.com/crossplane/crossplane/blob/main/design/design-doc-rbac-manager.md)
105105
has more information on the installed _ClusterRoles_.
106106

107107
## Installation options
@@ -110,7 +110,7 @@ has more information on the installed _ClusterRoles_.
110110
Crossplane supports customizations at install time by configuring the Helm
111111
chart.
112112

113-
Apply customizations with the command line or with a Helm _values_ file.
113+
Apply customizations with the command line or with a Helm _values_ file.
114114

115115
<!-- Generated from Helm README at https://github.com/crossplane/crossplane/blob/main/cluster/charts/crossplane/README.md -->
116116
<!-- vale gitlab.Substitutions = NO -->
@@ -125,17 +125,18 @@ Apply customizations with the command line or with a Helm _values_ file.
125125
| `customAnnotations` | Add custom `annotations` to the Crossplane pod deployment. | `{}` |
126126
| `customLabels` | Add custom `labels` to the Crossplane pod deployment. | `{}` |
127127
| `deploymentStrategy` | The deployment strategy for the Crossplane and RBAC Manager pods. | `"RollingUpdate"` |
128+
| `dnsPolicy` | Specify the `dnsPolicy` to be used by the Crossplane pod. | `""` |
128129
| `extraEnvVarsCrossplane` | Add custom environmental variables to the Crossplane pod deployment. Replaces any `.` in a variable name with `_`. For example, `SAMPLE.KEY=value1` becomes `SAMPLE_KEY=value1`. | `{}` |
129130
| `extraEnvVarsRBACManager` | Add custom environmental variables to the RBAC Manager pod deployment. Replaces any `.` in a variable name with `_`. For example, `SAMPLE.KEY=value1` becomes `SAMPLE_KEY=value1`. | `{}` |
130131
| `extraObjects` | To add arbitrary Kubernetes Objects during a Helm Install | `[]` |
131132
| `extraVolumeMountsCrossplane` | Add custom `volumeMounts` to the Crossplane pod. | `{}` |
132133
| `extraVolumesCrossplane` | Add custom `volumes` to the Crossplane pod. | `{}` |
133-
| `function.packages` | A list of Function packages to install. | `[]` |
134-
| `hostNetwork` | Enable `hostNetwork` for the Crossplane deployment. Caution: enabling `hostNetwork` grants the Crossplane Pod access to the host network namespace. | `false` |
134+
| `function.packages` | A list of Function packages to install | `[]` |
135+
| `hostNetwork` | Enable `hostNetwork` for the Crossplane deployment. Caution: enabling `hostNetwork` grants the Crossplane Pod access to the host network namespace. Consider setting `dnsPolicy` to `ClusterFirstWithHostNet`. | `false` |
135136
| `image.pullPolicy` | The image pull policy used for Crossplane and RBAC Manager pods. | `"IfNotPresent"` |
136137
| `image.repository` | Repository for the Crossplane pod image. | `"xpkg.crossplane.io/crossplane/crossplane"` |
137138
| `image.tag` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. | `""` |
138-
| `imagePullSecrets` | The imagePullSecret names to add to the Crossplane ServiceAccount. | `{}` |
139+
| `imagePullSecrets` | The imagePullSecret names to add to the Crossplane ServiceAccount. | `[]` |
139140
| `leaderElection` | Enable [leader election](https://docs.crossplane.io/latest/concepts/pods/#leader-election) for the Crossplane pod. | `true` |
140141
| `metrics.enabled` | Enable Prometheus path, port and scrape annotations and expose port 8080 for both the Crossplane and RBAC Manager pods. | `false` |
141142
| `nodeSelector` | Add `nodeSelectors` to the Crossplane pod deployment. | `{}` |
@@ -159,8 +160,8 @@ Apply customizations with the command line or with a Helm _values_ file.
159160
| `registryCaBundleConfig.key` | The ConfigMap key containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates. | `""` |
160161
| `registryCaBundleConfig.name` | The ConfigMap name containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates. | `""` |
161162
| `replicas` | The number of Crossplane pod `replicas` to deploy. | `1` |
162-
| `resourcesCrossplane.limits.cpu` | CPU resource limits for the Crossplane pod. | `"100m"` |
163-
| `resourcesCrossplane.limits.memory` | Memory resource limits for the Crossplane pod. | `"512Mi"` |
163+
| `resourcesCrossplane.limits.cpu` | CPU resource limits for the Crossplane pod. | `"500m"` |
164+
| `resourcesCrossplane.limits.memory` | Memory resource limits for the Crossplane pod. | `"1024Mi"` |
164165
| `resourcesCrossplane.requests.cpu` | CPU resource requests for the Crossplane pod. | `"100m"` |
165166
| `resourcesCrossplane.requests.memory` | Memory resource requests for the Crossplane pod. | `"256Mi"` |
166167
| `resourcesRBACManager.limits.cpu` | CPU resource limits for the RBAC Manager pod. | `"100m"` |
@@ -175,6 +176,7 @@ Apply customizations with the command line or with a Helm _values_ file.
175176
| `securityContextRBACManager.readOnlyRootFilesystem` | Set the RBAC Manager pod root file system as read-only. | `true` |
176177
| `securityContextRBACManager.runAsGroup` | The group ID used by the RBAC Manager pod. | `65532` |
177178
| `securityContextRBACManager.runAsUser` | The user ID used by the RBAC Manager pod. | `65532` |
179+
| `service.customAnnotations` | Configure annotations on the service object. Only enabled when webhooks.enabled = true | `{}` |
178180
| `serviceAccount.customAnnotations` | Add custom `annotations` to the Crossplane ServiceAccount. | `{}` |
179181
| `tolerations` | Add `tolerations` to the Crossplane pod deployment. | `[]` |
180182
| `topologySpreadConstraints` | Add `topologySpreadConstraints` to the Crossplane pod deployment. | `[]` |
@@ -185,7 +187,7 @@ Apply customizations with the command line or with a Helm _values_ file.
185187

186188
#### Command line customization
187189

188-
Apply custom settings at the command line with
190+
Apply custom settings at the command line with
189191
`helm install crossplane --set <setting>=<value>`.
190192

191193
For example, to change the image pull policy:
@@ -215,7 +217,7 @@ crossplane-stable/crossplane \
215217
Apply custom settings in a Helm _values_ file with
216218
`helm install crossplane -f <filename>`.
217219

218-
A YAML file defines the customized settings.
220+
A YAML file defines the customized settings.
219221

220222
For example, to change the image pull policy and number of replicas:
221223

@@ -241,9 +243,9 @@ crossplane-stable/crossplane \
241243
#### Feature flags
242244

243245
Crossplane introduces new features behind feature flags. By default
244-
alpha features are off. Crossplane enables beta features by default. To enable a
246+
alpha features are off. Crossplane enables beta features by default. To enable a
245247
feature flag, set the `args` value in the Helm chart. Available feature flags
246-
can be directly found by running `crossplane core start --help`, or by looking
248+
can be directly found by running `crossplane core start --help`, or by looking
247249
at the table below.
248250

249251
{{< expand "Feature flags" >}}
@@ -266,10 +268,12 @@ args='{"--enable-composition-functions","--enable-composition-webhook-schema-val
266268

267269
#### Change the default package registry
268270

269-
Beginning with Crossplane version 1.20.0 Crossplane uses the [crossplane-contrib](https://github.com/orgs/crossplane-contrib/packages) GitHub Container Registry at `xpkg.crossplane.io` by default for downloading and
270-
installing packages.
271+
Beginning with Crossplane version 1.20.0 Crossplane uses the
272+
[crossplane-contrib](https://github.com/orgs/crossplane-contrib/packages) GitHub
273+
Container Registry at `xpkg.crossplane.io` by default for downloading and
274+
installing packages.
271275

272-
Change the default registry location during the Crossplane install with
276+
Change the default registry location during the Crossplane install with
273277
`--set args='{"--registry=index.docker.io"}'`.
274278

275279
### Install pre-release Crossplane versions
@@ -278,7 +282,7 @@ Install a pre-release versions of Crossplane from the `master` Crossplane Helm c
278282
Versions in the `master` channel are under active development and may be unstable.
279283

280284
{{< hint "warning" >}}
281-
Don't use Crossplane `master` releases in production. Only use `stable` channel.
285+
Don't use Crossplane `master` releases in production. Only use `stable` channel.
282286
Only use `master` for testing and development.
283287
{{< /hint >}}
284288

@@ -302,7 +306,7 @@ helm repo update
302306
Install the Crossplane `master` Helm chart with `helm install`.
303307

304308
{{< hint "tip" >}}
305-
View the changes Crossplane makes to your cluster with the
309+
View the changes Crossplane makes to your cluster with the
306310
`helm install --dry-run --debug` options. Helm shows what configurations it
307311
applies without making changes to the Kubernetes cluster.
308312
{{< /hint >}}
@@ -313,14 +317,14 @@ Crossplane creates and installs into the `crossplane-system` namespace.
313317
helm install crossplane \
314318
--namespace crossplane-system \
315319
--create-namespace crossplane-master/crossplane \
316-
--devel
320+
--devel
317321
```
318322

319323
## Crossplane distributions
320324
Third-party vendors may maintain their own Crossplane distributions. Vendor
321325
supported distribution may have features or tooling that isn't in the
322-
Community Crossplane distribution.
326+
Community Crossplane distribution.
323327

324-
The CNCF certified third-party distributions as
325-
"[conformant](https://github.com/cncf/crossplane-conformance)" with the
328+
The CNCF certified third-party distributions as
329+
"[conformant](https://github.com/cncf/crossplane-conformance)" with the
326330
Community Crossplane distribution.

0 commit comments

Comments
 (0)