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/kustomize-controller
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.18.2
Choose a base ref
...
head repository: fluxcd/kustomize-controller
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.19.0
Choose a head ref
  • 16 commits
  • 15 files changed
  • 5 contributors

Commits on Dec 16, 2021

  1. Update Go to v1.17

    Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
    relu committed Dec 16, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    novemberborn Mark Wubben
    Copy the full SHA
    57220f8 View commit details

Commits on Dec 20, 2021

  1. Update flux pkg components

    Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
    relu committed Dec 20, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    novemberborn Mark Wubben
    Copy the full SHA
    ec9fdb1 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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    facda8b View commit details

Commits on Dec 22, 2021

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

    Fix inconsistent code-style raised at security audit
    stefanprodan authored Dec 22, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    1e84289 View commit details

Commits on Dec 30, 2021

  1. Update kustomization.md

    fix typo
    
    Signed-off-by: Gaál George <gb12335@gmail.com>
    gecube committed Dec 30, 2021
    Copy the full SHA
    2b32f0f View commit details

Commits on Jan 5, 2022

  1. Merge pull request #523 from gecube/patch-1

    Fix typo in API spec docs
    stefanprodan authored Jan 5, 2022
    Copy the full SHA
    ab9c0e9 View commit details
  2. Update source-controller/api to v0.20.0

    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    stefanprodan committed Jan 5, 2022
    Copy the full SHA
    5466544 View commit details
  3. Merge pull request #478 from fluxcd/go-v1.17

    Update Go to v1.17 and controller-runtime to v0.11
    stefanprodan authored Jan 5, 2022
    Copy the full SHA
    00257e0 View commit details
  4. Restore runc and image-spec patches

    Fix for CVE-2021-30465 and CVE-2021-41190
    
    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    stefanprodan committed Jan 5, 2022
    Copy the full SHA
    75b6130 View commit details

Commits on Jan 6, 2022

  1. Merge pull request #525 from fluxcd/update-runc

    Restore runc and image-spec patches
    stefanprodan authored Jan 6, 2022
    Copy the full SHA
    23efa82 View commit details
  2. Fix HPA diff (upstream bug)

    Update fluxcd/ssa to v0.8.0 that implements a workaround for a Kubernetes API server-side apply dry-run bug where the HPA custom metrics are duplicated.
    
    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    stefanprodan committed Jan 6, 2022
    Copy the full SHA
    9b0bb3d View commit details
  3. Merge pull request #526 from fluxcd/hpa-diff-fix

    Fix HPA diff (upstream bug)
    stefanprodan authored Jan 6, 2022
    Copy the full SHA
    ed4d153 View commit details

Commits on Jan 7, 2022

  1. If applied, this commit will solve race condition when using two Kust…

    …omizations with the same SourceRef
    
    Signed-off-by: Florian Fl Bauer <florian.fl.bauer@deutschebahn.com>
    derbauer97 committed Jan 7, 2022
    Copy the full SHA
    8435a5b View commit details

Commits on Jan 10, 2022

  1. Merge pull request #521 from HardBrainer/main

    Add condition to checkDependencies when SourceRef is the same
    stefanprodan authored Jan 10, 2022
    Copy the full SHA
    748120f View commit details
  2. Release v0.19.0

    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    stefanprodan committed Jan 10, 2022
    Copy the full SHA
    d4e13e5 View commit details
  3. Merge pull request #528 from fluxcd/release-v0.19.0

    Release v0.19.0
    stefanprodan authored Jan 10, 2022
    Copy the full SHA
    a195294 View commit details
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
@@ -39,7 +39,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:
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,27 @@

All notable changes to this project are documented in this file.

## 0.19.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.

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

Improvements:
* Update Go to v1.17 and controller-runtime to v0.11
[#478](https://github.com/fluxcd/kustomize-controller/pull/478)
* Add condition to checkDependencies when SourceRef is the same
[#521](https://github.com/fluxcd/kustomize-controller/pull/521)

Fixes:
* Fix HPA diff (upstream bug)
[#526](https://github.com/fluxcd/kustomize-controller/pull/526)
* Fix inconsistent code-style raised at security audit
[#522](https://github.com/fluxcd/kustomize-controller/pull/522)

## 0.18.2

**Release date:** 2021-12-09
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
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

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 / /
@@ -30,7 +31,7 @@ COPY internal/ internal/
ENV CGO_ENABLED=0
RUN xx-go build -a -o kustomize-controller main.go

FROM alpine:3.14
FROM alpine:3.15

LABEL org.opencontainers.image.source="https://github.com/fluxcd/kustomize-controller"

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
IMG ?= fluxcd/kustomize-controller:latest
# Produce CRDs that work back to Kubernetes 1.16
CRD_OPTIONS ?= crd:crdVersions=v1
SOURCE_VER ?= v0.19.2
SOURCE_VER ?= v0.20.1

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
@@ -122,7 +122,7 @@ ifeq (, $(shell which controller-gen))
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 ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
33 changes: 26 additions & 7 deletions api/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
module github.com/fluxcd/kustomize-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-20211216030914-fe4d6282115f // 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-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading