Skip to content

Commit

Permalink
flux1: Update helm-operator to v1.4.4
Browse files Browse the repository at this point in the history
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
  • Loading branch information
Paulo Gomes committed Sep 1, 2022
1 parent 8edd4ed commit 34c756a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .helm-op-release
@@ -1 +1 @@
1.4.3
1.4.4
2 changes: 1 addition & 1 deletion content/en/legacy/helm-operator/get-started/quickstart.md
Expand Up @@ -19,7 +19,7 @@ this CRD it will be possible to define `HelmRelease` resources on the
cluster:

```sh
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.3/deploy/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.4/deploy/crds.yaml
```

Create a new namespace:
Expand Down
4 changes: 2 additions & 2 deletions content/en/legacy/helm-operator/get-started/using-helm.md
Expand Up @@ -21,7 +21,7 @@ CRD it will be possible to define `HelmRelease` resources on the
cluster:

```sh
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.3/deploy/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.4/deploy/crds.yaml
```

Using `helm`, add the Flux Helm repository:
Expand Down Expand Up @@ -96,7 +96,7 @@ helm-operator-7cc7c798cc-kn26w 1/1 Running 0 18s
```console
$ kubectl logs -f deploy/helm-operator
...
ts=2020-01-01T12:00:00.556712443Z caller=helm.go:71 component=helm version=v2 info="connected to Tiller" version="sem_ver:\"v2.16.3\" git_commit:\"1ee0254c86d4ed6887327dabed7aa7da29d7eb0d\" git_tree_state:\"clean\" " host=tiller-deploy.kube-system:44134 options="{Host: Port: Namespace:kube-system TLSVerify:false TLSEnable:true TLSKey:/etc/fluxd/helm/tls.key TLSCert:/etc/fluxd/helm/tls.crt TLSCACert: TLSHostname:}"
ts=2020-01-01T12:00:00.55671.4.4Z caller=helm.go:71 component=helm version=v2 info="connected to Tiller" version="sem_ver:\"v2.16.3\" git_commit:\"1ee0254c86d4ed6887327dabed7aa7da29d7eb0d\" git_tree_state:\"clean\" " host=tiller-deploy.kube-system:44134 options="{Host: Port: Namespace:kube-system TLSVerify:false TLSEnable:true TLSKey:/etc/fluxd/helm/tls.key TLSCert:/etc/fluxd/helm/tls.crt TLSCACert: TLSHostname:}"

This comment has been minimized.

Copy link
@dholbach

dholbach Sep 21, 2022

Member

This looks like an oversight.

```

{{% alert color="info" title="Tip" %}}
Expand Down
Expand Up @@ -24,7 +24,7 @@ mkdir helm-operator
```

Create a `kustomization.yaml` file and use the [Helm Operator
deployment YAMLs](https://github.com/fluxcd/helm-operator/tree/1.4.3/deploy)
deployment YAMLs](https://github.com/fluxcd/helm-operator/tree/1.4.4/deploy)
as a base:

```sh
Expand Down Expand Up @@ -56,7 +56,7 @@ version number to the base URL:

```yaml
bases:
- github.com/fluxcd/helm-operator//deploy?ref=1.4.3
- github.com/fluxcd/helm-operator//deploy?ref=1.4.4
```
{{% /alert %}}

Expand Down
12 changes: 6 additions & 6 deletions content/en/legacy/helm-operator/get-started/using-yamls.md
Expand Up @@ -5,7 +5,7 @@ weight: 50
---

This guide walks you through setting up the Helm Operator using
[deployment YAMLs](https://github.com/fluxcd/helm-operator/tree/1.4.3/deploy).
[deployment YAMLs](https://github.com/fluxcd/helm-operator/tree/1.4.4/deploy).

## Prerequisites

Expand All @@ -20,7 +20,7 @@ First, install the `HelmRelease` Custom Resource Definition. By adding this CRD
it will be possible to define `HelmRelease` resources on the cluster:

```sh
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.3/deploy/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.4/deploy/crds.yaml
```

Proceed to create the `flux` namespace, this is the namespace the Helm Operator
Expand All @@ -34,13 +34,13 @@ Apply the `ServiceAccount`, `ClusterRole` and `ClusterRoleBinding` so that the
Helm Operator can access cluster resources:

```sh
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.3/deploy/rbac.yaml
kubectl apply -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.4/deploy/rbac.yaml
```

Apply the Helm Operator deployment itself:

```sh
kubectl deploy -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.3/deploy/deployment.yaml
kubectl deploy -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.4/deploy/deployment.yaml
```

### Helm 3
Expand All @@ -50,7 +50,7 @@ enabled. To disable support for Helm 2 (and recover from the Tiller connection
failure), patch the resource to set `--enabled-helm-versions=v3`:

```
kubectl deploy -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.3/deploy/deployment.yaml \
kubectl deploy -f https://raw.githubusercontent.com/fluxcd/helm-operator/1.4.4/deploy/deployment.yaml \
--type='json' \
-p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value":"--enabled-helm-versions=v3"}]'
```
Expand All @@ -62,7 +62,7 @@ does not take any custom configurations like Tiller TLS settings into account.
If your Tiller is e.g. in a different namespace than `kube-system` or
[securely setup](https://v2.helm.sh/docs/securing_installation/), take a look
at the available [Tiller configuration flags](../references/operator.md#tiller-configuration)
and [commented out sections](https://github.com/fluxcd/helm-operator/blob/1.4.3/deploy/deployment.yaml)
and [commented out sections](https://github.com/fluxcd/helm-operator/blob/1.4.4/deploy/deployment.yaml)
in the example deployment to further tweak your Helm Operator installation.

## Next
Expand Down
Expand Up @@ -42,6 +42,6 @@ for `foo-chart`, you would define the following in the `dependencies` of your
```yaml
dependencies:
- name:
version: ~1.4.3
version: ~1.4.4
repository: https://charts.example.com
```
Expand Up @@ -166,7 +166,7 @@ operator deployment, and `volumeMounts` of the Helm Operator container. A good
mount path for the `repositories.yaml` file that does not give conflicts with
any Helm paths is `/root/.helm/repository/repositories.yaml`. Examples of this
can be found in the commented-out sections of the [example
deployment](https://github.com/fluxcd/helm-operator/blob/1.4.3/deploy/deployment.yaml).
deployment](https://github.com/fluxcd/helm-operator/blob/1.4.4/deploy/deployment.yaml).

Lastly, configure the `--helm-repository-import` argument on the Helm Operator
container for your enabled Helm versions:
Expand Down Expand Up @@ -371,7 +371,7 @@ kubectl create secret generic flux-git-deploy \
```

Next, mount it into the Helm Operator container as shown in the
[example deployment](https://github.com/fluxcd/helm-operator/blob/1.4.3/deploy/deployment.yaml).
[example deployment](https://github.com/fluxcd/helm-operator/blob/1.4.4/deploy/deployment.yaml).

The default `ssh_config` that ships with the Helm Operator's Docker image
expects an identity file at `/etc/fluxd/ssh/identity`, which is where it will
Expand Down

0 comments on commit 34c756a

Please sign in to comment.