diff --git a/CHANGELOG.md b/CHANGELOG.md index 747e8203..eb9904d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project are documented in this file. +## 0.0.1-beta.2 (2020-06-10) + +This beta release allows configuring the number of concurrent reconciles. +Starting with this version, the controller watches for resources +only in the namespace where it's deployed. + ## 0.0.1-beta.1 (2020-05-29) This is the first beta release of kustomize controller. diff --git a/Dockerfile b/Dockerfile index e070274b..f8ba075a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ kustomize_url=https://github.com/kubernetes-sigs/kustomize/releases/download && curl -sL ${kustomize_url}/kustomize%2Fv${kustomize_ver}/kustomize_v${kustomize_ver}_linux_amd64.tar.gz | \ tar xz && mv kustomize /usr/local/bin/kustomize -RUN kubectl_ver=1.18.2 && \ +RUN kubectl_ver=1.18.3 && \ curl -sL https://storage.googleapis.com/kubernetes-release/release/v${kubectl_ver}/bin/linux/amd64/kubectl \ -o /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl @@ -27,7 +27,7 @@ COPY internal/ internal/ # build RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o kustomize-controller main.go -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache ca-certificates tar tini git socat curl bash diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 210d18b4..944cf990 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -5,6 +5,6 @@ resources: - ../crd - ../rbac - ../manager -- github.com/fluxcd/source-controller/config//crd?ref=v0.0.1-alpha.6 -- github.com/fluxcd/source-controller/config//manager?ref=v0.0.1-alpha.6 +- github.com/fluxcd/source-controller/config//crd?ref=v0.0.1-beta.2 +- github.com/fluxcd/source-controller/config//manager?ref=v0.0.1-beta.2 - namespace.yaml diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 6e7f065a..9d159a25 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ resources: images: - name: fluxcd/kustomize-controller newName: fluxcd/kustomize-controller - newTag: v0.0.1-beta.1 + newTag: v0.0.1-beta.2 diff --git a/controllers/kustomization_controller.go b/controllers/kustomization_controller.go index 98326f75..e7293e2d 100644 --- a/controllers/kustomization_controller.go +++ b/controllers/kustomization_controller.go @@ -287,7 +287,7 @@ func (r *KustomizationReconciler) download(kustomization kustomizev1.Kustomizati ctx, cancel := context.WithTimeout(context.Background(), timeout) defer cancel() - cmd := fmt.Sprintf("cd %s && curl -sL %s -o artifact.tar.gz && tar -xzf artifact.tar.gz --strip-components=1 -C .", + cmd := fmt.Sprintf("cd %s && curl -sL %s -o artifact.tar.gz && tar -xzf artifact.tar.gz -C .", tmpDir, url) command := exec.CommandContext(ctx, "/bin/sh", "-c", cmd) output, err := command.CombinedOutput() diff --git a/go.mod b/go.mod index e701e93e..2b7e85dc 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/fluxcd/kustomize-controller go 1.13 require ( - github.com/fluxcd/source-controller v0.0.1-alpha.6 + github.com/fluxcd/source-controller v0.0.1-beta.2 github.com/go-logr/logr v0.1.0 github.com/onsi/ginkgo v1.11.0 github.com/onsi/gomega v1.8.1 diff --git a/go.sum b/go.sum index 9a250c97..d68c8a25 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/source-controller v0.0.1-alpha.6 h1:CpSH1mA9bRjifRwmcVS98ejY2MA9ofTyLbl2xwT0MqM= -github.com/fluxcd/source-controller v0.0.1-alpha.6/go.mod h1:gvU+sR6yH9kbyWZAJ9NEBQJMsJ+S3yCyOdPIhM+8FUI= +github.com/fluxcd/source-controller v0.0.1-beta.2 h1:XOtc+tSf/8Q0bTVla2L5FdCMMjJWFSPWX/o4/h4OUv0= +github.com/fluxcd/source-controller v0.0.1-beta.2/go.mod h1:tmscNdCxEt7+Xt2g1+bI38hMPw2leYMFAaCn4UlMGuw= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -479,6 +479,7 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sosedoff/gitkit v0.2.1-0.20191202022816-7182d43c6254/go.mod h1:A+o6ZazfVJwetlcHz3ah6th66XcBdsyzLo+aBt/AsK4= github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=