Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fluxcd/helm-controller
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.12.1
Choose a base ref
...
head repository: fluxcd/helm-controller
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.12.2
Choose a head ref
  • 14 commits
  • 8 files changed
  • 6 contributors

Commits on Oct 21, 2021

  1. Fix indentation in PostRenderer 

    The indentation of this example is slightly off

Signed-off-by: Kingdon Barrett <kingdon@weave.works>
    Kingdon Barrett committed Oct 21, 2021

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    3f49b81 View commit details

Commits on Oct 22, 2021

  1. Merge pull request #343 from kingdonb/fixup-postrenderer-example 

    Fix indentation in PostRenderer
    @stefanprodan
    stefanprodan authored Oct 22, 2021

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    4108737 View commit details

  2. 'how to ...' should not be under comms 

    Signed-off-by: Daniel Holbach <daniel@weave.works>
    Daniel Holbach committed Oct 22, 2021

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    3c90530 View commit details

  3. Merge pull request #340 from dholbach/fix-contributing-sections 

    'how to ...' should not be under comms
    @stefanprodan
    stefanprodan authored Oct 22, 2021
    Copy the full SHA
    9eb8024 View commit details

Commits on Oct 25, 2021

  1. Set the managed fields owner to helm-controller 

    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    @stefanprodan
    stefanprodan committed Oct 25, 2021
    Copy the full SHA
    049aca9 View commit details

  2. Merge pull request #346 from fluxcd/managed-fields-manager 

    Set the managed fields owner to helm-controller
    @makkes
    makkes authored Oct 25, 2021
    Copy the full SHA
    4d6eb62 View commit details

Commits on Oct 26, 2021

  1. As part of fluxcd/.github#4, create DEVELOPMENT.md 

    	Will link to this doc from fluxcd.io/contributing
	so new folks can find this easily.

Signed-off-by: Daniel Holbach <daniel@weave.works>
    Daniel Holbach committed Oct 26, 2021
    Copy the full SHA
    2d45155 View commit details

  2. Merge pull request #347 from dholbach/move-contributor-doc

    @hiddeco
    hiddeco authored Oct 26, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3912a9a View commit details

Commits on Nov 3, 2021

  1. Downgrade Helm to v3.6.3 due to OOM issues 

    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    @stefanprodan
    stefanprodan committed Nov 3, 2021
    Copy the full SHA
    4fe7a7c View commit details

Commits on Nov 11, 2021

  1. Merge pull request #352 from fluxcd/downgrade-helm-v3.6.3

    @hiddeco
    hiddeco authored Nov 11, 2021
    Copy the full SHA
    94dd9a0 View commit details

  2. Replace containerd with version that patches CVEs 

    - GHSA-c2h3-6mxw-7mvq
- GHSA-c72p-9xmj-rx3w

Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Nov 11, 2021
    Copy the full SHA
    ed6005a View commit details

  3. Merge pull request #356 from fluxcd/containerd-security-patch

    @hiddeco
    hiddeco authored Nov 11, 2021
    Copy the full SHA
    1806f34 View commit details

  4. Release v0.12.2 

    Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco
    hiddeco committed Nov 11, 2021
    Copy the full SHA
    d540742 View commit details

  5. Merge pull request #357 from fluxcd/release-v0.12.2

    @hiddeco
    hiddeco authored Nov 11, 2021
    Copy the full SHA
    9e51c3a View commit details
Showing with 355 additions and 590 deletions.
  1. +20 −0 CHANGELOG.md
  2. +0 −114 CONTRIBUTING.md
  3. +50 −0 DEVELOPMENT.md
  4. +1 −1 config/manager/kustomization.yaml
  5. +1 −1 docs/spec/v2beta1/helmreleases.md
  6. +16 −3 go.mod
  7. +263 −471 go.sum
  8. +4 −0 main.go
20 changes: 20 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## 0.12.2

**Release date:** 2021-11-11

This prerelease downgrades Helm to `v3.6.3` due to high memory usage issues
inherited from upstream dependency changes. For technical details about the
issue, see [this comment](https://github.com/fluxcd/helm-controller/issues/345#issuecomment-959104091).

As Helm `v3.7.0` did not introduce any new features from the perspective of
the controller, we consider this to be a patch which reverts the unwanted
behavior introduced in `v0.12.0`.

Fixes:
* Set the managed fields owner to helm-controller
[#346](https://github.com/fluxcd/helm-controller/pull/346)
* Downgrade Helm to v3.6.3 due to OOM issues
[#352](https://github.com/fluxcd/helm-controller/pull/352)
* Replace containerd with version that patches CVEs
[#356](https://github.com/fluxcd/helm-controller/pull/356)

## 0.12.1

**Release date:** 2021-10-14
114 changes: 0 additions & 114 deletions CONTRIBUTING.md
View file

This file was deleted.

50 changes: 50 additions & 0 deletions DEVELOPMENT.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Development

> **Note:** Please take a look at <https://fluxcd.io/docs/contributing/flux/>
> to find out about how to contribute to Flux and how to interact with the
> Flux Development team.
## How to run the test suite

Prerequisites:
* go >= 1.16
* kubebuilder >= 2.3
* kustomize >= 3.1

You can run the unit tests by simply doing

```bash
make test
```

## How to run the controller locally

Install flux on your test cluster:

```sh
flux install
```

Scale the in-cluster controller to zero:

```sh
kubectl -n flux-system scale deployment/helm-controller --replicas=0
```

Port forward to source-controller artifacts server:

```sh
kubectl -n flux-system port-forward svc/source-controller 8080:80
```

Export the local address as `SOURCE_CONTROLLER_LOCALHOST`:

```sh
export SOURCE_CONTROLLER_LOCALHOST=localhost:8080
```

Run the controller locally:

```sh
make run
```
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@ resources:
images:
- name: fluxcd/helm-controller
newName: fluxcd/helm-controller
newTag: v0.12.1
newTag: v0.12.2
2 changes: 1 addition & 1 deletion docs/spec/v2beta1/helmreleases.md
View file
Original file line number Diff line number Diff line change
@@ -1171,7 +1171,7 @@ spec:
- key: "workload-type"
operator: "Equal"
value: "cluster-services"
effect: "NoSchedule"
effect: "NoSchedule"
# Array of inline JSON6902 patch definitions as YAML object.
# Note, this is a YAML object and not a string, to avoid syntax
# indention errors.
19 changes: 16 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -5,23 +5,36 @@ go 1.16
replace github.com/fluxcd/helm-controller/api => ./api

require (
github.com/fluxcd/helm-controller/api v0.12.1
github.com/fluxcd/helm-controller/api v0.12.2
github.com/fluxcd/pkg/apis/kustomize v0.1.0
github.com/fluxcd/pkg/apis/meta v0.10.0
github.com/fluxcd/pkg/runtime v0.12.0
github.com/fluxcd/source-controller/api v0.16.0
github.com/go-logr/logr v0.4.0
github.com/hashicorp/go-retryablehttp v0.6.8
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
github.com/onsi/gomega v1.15.0
github.com/spf13/pflag v1.0.5
helm.sh/helm/v3 v3.7.1
k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/cli-runtime v0.22.1
k8s.io/client-go v0.22.1
sigs.k8s.io/controller-runtime v0.9.5
sigs.k8s.io/controller-runtime v0.9.7
sigs.k8s.io/kustomize/api v0.10.0
sigs.k8s.io/yaml v1.2.0
)

// Freeze Helm due to OOM issues https://github.com/fluxcd/helm-controller/issues/345
replace helm.sh/helm/v3 => helm.sh/helm/v3 v3.6.3

// Required by https://github.com/helm/helm/blob/v3.6.3/go.mod
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d

// Fix CVE-2021-30465
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc95

// Fix CVE-2021-32760
// Fix CVE-2021-41103
replace github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
Loading