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.14.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.15.0
Choose a head ref
  • 13 commits
  • 18 files changed
  • 5 contributors

Commits on Dec 9, 2021

  1. Controller-gen and envtest are downloaded and used locally 

    * controller-gen and envtest are downloaded to a `bin` folder, local to the project, and used from there
* envtest assets are installed in a `testbin` folder, local to the project, and used from there

Signed-off-by: Cecilia Bernardi <cbernardi@expediagroup.com>
    @cebernardi
    cebernardi committed Dec 9, 2021
    Copy the full SHA
    1d03726 View commit details

  2. Merge pull request #369 from cebernardi/download-locally-controller-g… 

    …en-and-testenv

Download and use controller-gen and envtest locally
    @stefanprodan
    stefanprodan authored Dec 9, 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
    93d7e43 View commit details

Commits on Dec 21, 2021

  1. Check EventRecorder is not nil 

    Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
    Paulo Gomes committed Dec 21, 2021

    Unverified

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

  2. Short-circuit event handling 

    When ExternalEventRecorder is nil, the helm release reference is not used
therefore the function can safely return early.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
    Paulo Gomes committed Dec 21, 2021

    Unverified

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

Commits on Dec 22, 2021

  1. Merge pull request #386 from pjbgf/audit-followup 

    Fix inconsistent code-style raised at security audit
    @stefanprodan
    stefanprodan authored Dec 22, 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
    e2b988a View commit details

Commits on Jan 7, 2022

  1. Update Helm to v3.7.2 

    This commit updates Helm to 3.7.2, in an attempt to get to a v3.7.x
release range _without_ any memory issues (see #345), which should have
been addressed in this release.

The change in replacements has been cross-checked with the dependencies
of Helm (and more specifically, the Oras project), and confirmed to not
trigger any warnings using `trivy`.

Signed-off-by: Hidde Beydals <hello@hidde.co>
    @hiddeco @stefanprodan
    hiddeco authored and stefanprodan committed Jan 7, 2022

    Partially verified

    This commit is signed with the committer’s verified signature.
    stefanprodan’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    de19dac View commit details

  2. Merge pull request #380 from fluxcd/update-helm 

    Update Helm to v3.7.2
    @stefanprodan
    stefanprodan authored Jan 7, 2022

    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
    9fc7867 View commit details

  3. Update Go to v1.17 

    Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
    @relu
    relu committed Jan 7, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    relu Aurel Canciu
    GPG key ID: AB25339971E6F81E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    57d4c29 View commit details

  4. Update flux pkg components 

    Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
    @relu
    relu committed Jan 7, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    relu Aurel Canciu
    GPG key ID: AB25339971E6F81E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c82071 View commit details

  5. Update containerd to v1.5.9 (fix CVE-2021-43816) 

    Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
    @relu
    relu committed Jan 7, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    relu Aurel Canciu
    GPG key ID: AB25339971E6F81E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4a54418 View commit details

Commits on Jan 9, 2022

  1. Merge pull request #348 from fluxcd/go-v1.17 

    Update Go to v1.17
    @stefanprodan
    stefanprodan authored Jan 9, 2022

    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
    5303093 View commit details

Commits on Jan 10, 2022

  1. Release v0.15.0 

    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    @stefanprodan
    stefanprodan committed Jan 10, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    stefanprodan Stefan Prodan
    GPG key ID: 3299AEB0E4085BAF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a75c4a0 View commit details

  2. Merge pull request #389 from fluxcd/release-v0.15.0 

    Release v0.15.0
    @stefanprodan
    stefanprodan authored Jan 10, 2022

    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
    32f0c07 View commit details
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
- name: Setup Kubernetes
uses: engineerd/setup-kind@v0.5.0
with:
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
*.so
*.dylib
bin
testbin

# Test binary, build with `go test -c`
*.test
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# Changelog

## 0.15.0

**Release date:** 2022-01-10

This prerelease comes with an update to the Kubernetes and controller-runtime dependencies
to align them with the Kubernetes 1.23 release, including an update of Helm to `v3.7.2`.

In addition, the controller is now built with Go 1.17 and Alpine 3.15.

Improvements:
- Update Go to v1.17
[#348](https://github.com/fluxcd/helm-controller/pull/348)
- Update Helm to v3.7.2
[#380](https://github.com/fluxcd/helm-controller/pull/380)

Fixes:
- Fix inconsistent code-style raised at security audit
[#386](https://github.com/fluxcd/helm-controller/pull/386)

## 0.14.1

**Release date:** 2021-12-09
7 changes: 4 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
ARG XX_VERSION=1.0.0-rc.2
ARG GO_VERSION=1.17
ARG XX_VERSION=1.1.0

FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

# Docker buildkit multi-arch build requires golang alpine
FROM --platform=$BUILDPLATFORM golang:1.16-alpine as builder
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine as builder

# Copy the build utilities.
COPY --from=xx / /
@@ -31,7 +32,7 @@ COPY internal/ internal/
ENV CGO_ENABLED=0
RUN xx-go build -a -o helm-controller main.go

FROM alpine:3.14
FROM alpine:3.15

# link repo to the GitHub Container Registry image
LABEL org.opencontainers.image.source="https://github.com/fluxcd/helm-controller"
51 changes: 35 additions & 16 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,15 @@ BUILD_ARGS ?=
# Architectures to build images for.
BUILD_PLATFORMS ?= linux/amd64

# Architecture to use envtest with
ENVTEST_ARCH ?= amd64

all: manager

# Run tests
test: generate fmt vet manifests api-docs
go test ./... -coverprofile cover.out
KUBEBUILDER_ASSETS?="$(shell $(ENVTEST) --arch=$(ENVTEST_ARCH) use -i $(ENVTEST_KUBERNETES_VERSION) --bin-dir=$(ENVTEST_ASSETS_DIR) -p path)"
test: generate fmt vet manifests api-docs install-envtest
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test ./... -coverprofile cover.out
cd api; go test ./... -coverprofile cover.out

# Build manager binary
@@ -98,20 +102,10 @@ docker-push:
docker push ${IMG}

# Find or download controller-gen
controller-gen:
ifeq (, $(shell which controller-gen))
@{ \
set -e ;\
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
else
CONTROLLER_GEN=$(shell which controller-gen)
endif
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)

# Find or download gen-crd-api-reference-docs
gen-crd-api-reference-docs:
@@ -128,3 +122,28 @@ API_REF_GEN=$(GOBIN)/gen-crd-api-reference-docs
else
API_REF_GEN=$(shell which gen-crd-api-reference-docs)
endif

ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
ENVTEST_KUBERNETES_VERSION?=latest
install-envtest: setup-envtest
mkdir -p ${ENVTEST_ASSETS_DIR}
$(ENVTEST) use $(ENVTEST_KUBERNETES_VERSION) --arch=$(ENVTEST_ARCH) --bin-dir=$(ENVTEST_ASSETS_DIR)

ENVTEST = $(shell pwd)/bin/setup-envtest
.PHONY: envtest
setup-envtest: ## Download envtest-setup locally if necessary.
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)

# go-get-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
define go-get-tool
@[ -f $(1) ] || { \
set -e ;\
TMP_DIR=$$(mktemp -d) ;\
cd $$TMP_DIR ;\
go mod init tmp ;\
echo "Downloading $(2)" ;\
GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
rm -rf $$TMP_DIR ;\
}
endef
32 changes: 25 additions & 7 deletions api/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
module github.com/fluxcd/helm-controller/api

go 1.16
go 1.17

require (
github.com/fluxcd/pkg/apis/kustomize v0.3.0
github.com/fluxcd/pkg/apis/meta v0.10.1
github.com/fluxcd/pkg/runtime v0.12.2
k8s.io/apiextensions-apiserver v0.22.2
k8s.io/apimachinery v0.22.2
sigs.k8s.io/controller-runtime v0.10.2
github.com/fluxcd/pkg/apis/kustomize v0.3.1
github.com/fluxcd/pkg/apis/meta v0.10.2
github.com/fluxcd/pkg/runtime v0.12.3
k8s.io/apiextensions-apiserver v0.23.1
k8s.io/apimachinery v0.23.1
sigs.k8s.io/controller-runtime v0.11.0
)

require (
github.com/go-logr/logr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 // indirect
golang.org/x/text v0.3.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
)
Loading