Skip to content

Commit

Permalink
upgrade apis for helm GA
Browse files Browse the repository at this point in the history
Signed-off-by: Soule BA <bah.soule@gmail.com>
  • Loading branch information
souleb committed May 13, 2024
1 parent 55bbca7 commit b3dba1e
Show file tree
Hide file tree
Showing 14 changed files with 79 additions and 79 deletions.
4 changes: 2 additions & 2 deletions content/en/flagger/install/flagger-install-with-flux.md
Expand Up @@ -41,7 +41,7 @@ metadata:
Define a Flux `HelmRepository` that points to where the Flagger Helm charts are stored:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: flagger
Expand All @@ -56,7 +56,7 @@ Define a Flux `HelmRelease` that verifies and installs Flagger's latest version

```yaml
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: flagger
Expand Down
10 changes: 5 additions & 5 deletions content/en/flux/cheatsheets/oci-artifacts.md
Expand Up @@ -96,7 +96,7 @@ defining Helm releases with charts stored in container registries.
Example:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: podinfo
Expand All @@ -106,7 +106,7 @@ spec:
type: oci
url: oci://ghcr.io/stefanprodan/charts
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down Expand Up @@ -443,7 +443,7 @@ cosign sign --key cosign.key <registry-host>/<org>/charts/<app-name>:<app-versio
You can configure Flux to verify the chart signature before installing and upgrading a Helm release:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: helm-charts
Expand All @@ -452,7 +452,7 @@ spec:
url: oci://<registry-host>/<org>/charts
type: oci
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: <app-name>
Expand Down Expand Up @@ -683,7 +683,7 @@ spec:
Then add the policy marker to the `HelmRelease` manifest in Git:

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down
2 changes: 1 addition & 1 deletion content/en/flux/cheatsheets/troubleshooting.md
Expand Up @@ -219,7 +219,7 @@ Deployment is not ready: default/podinfo. 0 out of 1 expected pods are ready
To inspect the failing resources, you can disable the health checks with:

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down
12 changes: 6 additions & 6 deletions content/en/flux/faq.md
Expand Up @@ -321,7 +321,7 @@ You can take advantage of Flux's OCI and native Helm features,
by replacing the `kustomization.yaml` with a Flux Helm definition:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: kyverno
Expand All @@ -331,7 +331,7 @@ spec:
url: oci://ghcr.io/kyverno/charts
type: oci
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: kyverno
Expand Down Expand Up @@ -441,7 +441,7 @@ Create a Helm release with `kubectl`:
```sh
cat << EOF | kubectl apply -f -
---
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: bitnami
Expand All @@ -450,7 +450,7 @@ spec:
interval: 30m
url: https://charts.bitnami.com/bitnami
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: metrics-server
Expand Down Expand Up @@ -480,7 +480,7 @@ when Bitnami publishes a new version of the metrics-server chart.
Lets assume we have a common `HelmRelease` definition we use as a base and we
we need to further customize it e.g per cluster, tenant, environment and so on:
```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down Expand Up @@ -534,7 +534,7 @@ spec:
#### Using Kustomize variable substitution

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down
2 changes: 1 addition & 1 deletion content/en/flux/flux-e2e.md
Expand Up @@ -621,7 +621,7 @@ The health checking feature is called [Health Checks][] in the Flux Kustomizatio
[Helm Use Case]: /flux/use-cases/helm/
[HelmRepository API]: /flux/components/source/helmrepositories/
[HelmChart API]: /flux/components/source/helmcharts/
[HelmChartTemplate.spec.reconcileStrategy]: /flux/components/helm/api/v2beta2#helm.toolkit.fluxcd.io/v2beta2.HelmChartTemplate
[HelmChartTemplate.spec.reconcileStrategy]: /flux/components/helm/api/v2#helm.toolkit.fluxcd.io/v2.HelmChartTemplate
[Setup Notifications]: /flux/guides/notifications/
[Alert API]: /flux/components/notification/alert/
[Event API]: /flux/components/notification/event/
Expand Down
34 changes: 17 additions & 17 deletions content/en/flux/guides/helmreleases.md
Expand Up @@ -44,7 +44,7 @@ The source-controller will fetch the Helm repository index for this
resource on an interval and expose it as an artifact:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: podinfo
Expand Down Expand Up @@ -75,7 +75,7 @@ For HTTP/S repositories, the credentials can be provided as a secret reference w
basic authentication.

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: podinfo
Expand Down Expand Up @@ -202,13 +202,13 @@ To release a Helm chart, a `HelmRelease` resource has to be created.
### Using a chart template

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
namespace: default
spec:
interval: 5m
interval: 10m
chart:
spec:
chart: <name|path>
Expand All @@ -217,7 +217,7 @@ spec:
kind: <HelmRepository|GitRepository|Bucket>
name: podinfo
namespace: flux-system
interval: 1m
interval: 10m
values:
replicaCount: 2
```
Expand Down Expand Up @@ -254,7 +254,7 @@ for more details.

It is possible to reference a chart directly from an `OCIRepository`:
```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand All @@ -263,15 +263,15 @@ spec:
kind: OCIRepository
name: podinfo
namespace: flux-system
interval: 30s
interval: 10m
values:
replicaCount: 2
```


Or a `HelmChart`:
```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand All @@ -280,7 +280,7 @@ spec:
kind: HelmChart
name: podinfo
namespace: flux-system
interval: 30s
interval: 10m
values:
replicaCount: 2
```
Expand Down Expand Up @@ -320,13 +320,13 @@ nameReference:
Create a `HelmRelease` definition that references a `ConfigMap`:

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
namespace: podinfo
spec:
interval: 5m
interval: 10m
releaseName: podinfo
chart:
spec:
Expand Down Expand Up @@ -361,7 +361,7 @@ When [kustomize-controller](../components/kustomize/_index.md) reconciles the ab
a unique name of the `ConfigMap` every time `my-values.yaml` content is updated in Git:

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down Expand Up @@ -401,13 +401,13 @@ nameReference:
Create a `HelmRelease` definition that references a `Secret`:

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
namespace: podinfo
spec:
interval: 5m
interval: 10m
releaseName: podinfo
chart:
spec:
Expand Down Expand Up @@ -504,13 +504,13 @@ in the context then they can recover decrypted values using `helm get values`.
It is possible to replace the `values.yaml` with a different file present inside the Helm chart.

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: mongodb
namespace: mongodb
spec:
interval: 5m
interval: 10m
chart:
spec:
chart: mongodb
Expand Down Expand Up @@ -637,7 +637,7 @@ It is possible to create a new chart artifact when a Source's revision has chang
`version` in the Chart.yml has not been bumped, for `GitRepository` and `Bucket` sources.

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmChart
metadata:
name: podinfo
Expand Down
2 changes: 1 addition & 1 deletion content/en/flux/guides/image-update.md
Expand Up @@ -404,7 +404,7 @@ Here are some examples of using this marker in a variety of Kubernetes resources
`HelmRelease` example:

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down
4 changes: 2 additions & 2 deletions content/en/flux/guides/repository-structure.md
Expand Up @@ -230,14 +230,14 @@ App repository Helm chart example:
Delivery example (stored in config repo):

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: apps
spec:
url: https://<host>/<org>/charts
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: app
Expand Down
4 changes: 2 additions & 2 deletions content/en/flux/guides/sealed-secrets.md
Expand Up @@ -122,7 +122,7 @@ to the fleet repository.
Helm repository manifest:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: sealed-secrets
Expand All @@ -135,7 +135,7 @@ spec:
Helm release manifest:

```yaml
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: sealed-secrets
Expand Down
6 changes: 3 additions & 3 deletions content/en/flux/installation/configuration/sharding.md
Expand Up @@ -243,7 +243,7 @@ to the `shard1` controllers, label the HelmRelease, its chart and its repository
with `sharding.fluxcd.io/key: shard1`:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: HelmRepository
metadata:
name: podinfo
Expand All @@ -255,7 +255,7 @@ spec:
type: oci
url: oci://ghcr.io/stefanprodan/charts
---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: podinfo
Expand Down Expand Up @@ -309,7 +309,7 @@ spec:
- target:
kind: HelmRelease
patch: |
apiVersion: helm.toolkit.fluxcd.io/v2beta2
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: all
Expand Down

0 comments on commit b3dba1e

Please sign in to comment.