diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index c292acc7..5c310446 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -42,6 +42,8 @@ jobs: if [[ "${MOD_VERSION}" != "${LATEST_VERSION}" ]]; then go mod edit -require="github.com/fluxcd/$1/api@${LATEST_VERSION}" + rm go.sum + go mod tidy changed=true fi @@ -59,9 +61,6 @@ jobs: bump_version image-reflector-controller bump_version image-automation-controller - # add missing and remove unused modules - go mod tidy - # diff change git diff @@ -73,21 +72,21 @@ jobs: id: cpr uses: peter-evans/create-pull-request@v3 with: - token: ${{ secrets.BOT_GITHUB_TOKEN }} - commit-message: | - Update toolkit components + token: ${{ secrets.BOT_GITHUB_TOKEN }} + commit-message: | + Update toolkit components - ${{ steps.update.outputs.pr_body }} - committer: GitHub - author: fluxcdbot - signoff: true - branch: update-components - title: Update toolkit components - body: | - ${{ steps.update.outputs.pr_body }} - labels: | - area/build - reviewers: ${{ secrets.ASSIGNEES }} + ${{ steps.update.outputs.pr_body }} + committer: GitHub + author: fluxcdbot + signoff: true + branch: update-components + title: Update toolkit components + body: | + ${{ steps.update.outputs.pr_body }} + labels: | + area/build + reviewers: ${{ secrets.ASSIGNEES }} - name: Check output run: | diff --git a/go.mod b/go.mod index 6d225c2c..0d918ab3 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/fluxcd/pkg/ssh v0.0.5 github.com/fluxcd/pkg/untar v0.0.5 github.com/fluxcd/pkg/version v0.0.1 - github.com/fluxcd/source-controller/api v0.12.0 + github.com/fluxcd/source-controller/api v0.12.1 github.com/go-git/go-git/v5 v5.1.0 github.com/google/go-containerregistry v0.2.0 github.com/manifoldco/promptui v0.7.0 diff --git a/go.sum b/go.sum index 9385968c..a9a0fc2e 100644 --- a/go.sum +++ b/go.sum @@ -212,8 +212,9 @@ github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7g github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw= github.com/fluxcd/pkg/version v0.0.1 h1:/8asQoDXSThz3csiwi4Qo8Zb6blAxLXbtxNgeMJ9bCg= github.com/fluxcd/pkg/version v0.0.1/go.mod h1:WAF4FEEA9xyhngF8TDxg3UPu5fA1qhEYV8Pmi2Il01Q= -github.com/fluxcd/source-controller/api v0.12.0 h1:ATzWCIXE96Q1iOHElzM0V4xCVEn95QLKpOSmVLiY/lo= github.com/fluxcd/source-controller/api v0.12.0/go.mod h1:+EPyhxC7Y+hUnq7EwAkkLtfbwCxJxF5yfmiyzDk43KY= +github.com/fluxcd/source-controller/api v0.12.1 h1:ubO3gwGaxnXwayJeDHpdsh96NXwOLpFcbLjZo/pqWCg= +github.com/fluxcd/source-controller/api v0.12.1/go.mod h1:+EPyhxC7Y+hUnq7EwAkkLtfbwCxJxF5yfmiyzDk43KY= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml index 282bf405..09bff7cd 100644 --- a/manifests/bases/source-controller/kustomization.yaml +++ b/manifests/bases/source-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/source-controller/releases/download/v0.12.0/source-controller.crds.yaml -- https://github.com/fluxcd/source-controller/releases/download/v0.12.0/source-controller.deployment.yaml +- https://github.com/fluxcd/source-controller/releases/download/v0.12.1/source-controller.crds.yaml +- https://github.com/fluxcd/source-controller/releases/download/v0.12.1/source-controller.deployment.yaml - account.yaml patchesJson6902: - target: diff --git a/manifests/crds/kustomization.yaml b/manifests/crds/kustomization.yaml index e36c7caa..470d1038 100644 --- a/manifests/crds/kustomization.yaml +++ b/manifests/crds/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/source-controller/releases/download/v0.12.0/source-controller.crds.yaml +- https://github.com/fluxcd/source-controller/releases/download/v0.12.1/source-controller.crds.yaml - https://github.com/fluxcd/kustomize-controller/releases/download/v0.11.1/kustomize-controller.crds.yaml - https://github.com/fluxcd/helm-controller/releases/download/v0.10.0/helm-controller.crds.yaml - https://github.com/fluxcd/notification-controller/releases/download/v0.13.0/notification-controller.crds.yaml