Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package flux2-cli for openSUSE:Factory checked in at 2023-07-12 17:27:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flux2-cli (Old) and /work/SRC/openSUSE:Factory/.flux2-cli.new.8922 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flux2-cli" Wed Jul 12 17:27:34 2023 rev:4 rq:1098226 version:2.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/flux2-cli/flux2-cli.changes 2023-07-06 18:29:01.343274485 +0200 +++ /work/SRC/openSUSE:Factory/.flux2-cli.new.8922/flux2-cli.changes 2023-07-12 17:28:02.362788577 +0200 @@ -1,0 +2,12 @@ +Tue Jul 11 13:36:20 UTC 2023 - [email protected] + +- Update to version 2.0.1: + * Update dependencies - bump the APIs packages in tests - bump + golang crypto and term to latest + * Take into account the server-side inventory for local diff + * Update toolkit components + * ci: release: extract the image tag from GITHUB_REF + * ci: backport: set write permissions + * ci: release: disable interpretation backslash esc + +------------------------------------------------------------------- Old: ---- flux2-2.0.0.obscpio New: ---- flux2-2.0.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flux2-cli.spec ++++++ --- /var/tmp/diff_new_pack.i1iPRt/_old 2023-07-12 17:28:03.798798518 +0200 +++ /var/tmp/diff_new_pack.i1iPRt/_new 2023-07-12 17:28:03.806798573 +0200 @@ -21,7 +21,7 @@ %define repo_name flux2 Name: flux2-cli -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: CLI for Flux2CD License: Apache-2.0 @@ -104,12 +104,12 @@ cp %{SOURCE15} ./manifests/bases/image-reflector-controller/ cp %{SOURCE16} ./manifests/bases/image-reflector-controller/ -sed -i 's_https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.0/__g' manifests/bases/image-reflector-controller/kustomization.yaml +sed -i 's_https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.1/__g' manifests/bases/image-reflector-controller/kustomization.yaml cat manifests/bases/image-reflector-controller/kustomization.yaml cp %{SOURCE17} ./manifests/bases/kustomize-controller/ cp %{SOURCE18} ./manifests/bases/kustomize-controller/ -sed -i 's_https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.0/__g' manifests/bases/kustomize-controller/kustomization.yaml +sed -i 's_https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.1/__g' manifests/bases/kustomize-controller/kustomization.yaml cat manifests/bases/kustomize-controller/kustomization.yaml cp %{SOURCE19} ./manifests/bases/notification-controller/ @@ -119,7 +119,7 @@ cp %{SOURCE21} ./manifests/bases/source-controller/ cp %{SOURCE22} ./manifests/bases/source-controller/ -sed -i 's_https://github.com/fluxcd/source-controller/releases/download/v1.0.0/__g' manifests/bases/source-controller/kustomization.yaml +sed -i 's_https://github.com/fluxcd/source-controller/releases/download/v1.0.1/__g' manifests/bases/source-controller/kustomization.yaml cat manifests/bases/source-controller/kustomization.yaml ./manifests/scripts/bundle.sh ++++++ _service ++++++ --- /var/tmp/diff_new_pack.i1iPRt/_old 2023-07-12 17:28:03.858798933 +0200 +++ /var/tmp/diff_new_pack.i1iPRt/_new 2023-07-12 17:28:03.862798961 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/fluxcd/flux2</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v2.0.0</param> + <param name="revision">v2.0.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -17,7 +17,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">flux2-2.0.0.obscpio</param> + <param name="archive">flux2-2.0.1.obscpio</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.i1iPRt/_old 2023-07-12 17:28:03.882799099 +0200 +++ /var/tmp/diff_new_pack.i1iPRt/_new 2023-07-12 17:28:03.882799099 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/fluxcd/flux2</param> - <param name="changesrevision">9ea0a535eab2c99121fb3ac742e333b4a9f07970</param></service></servicedata> + <param name="changesrevision">9b3162495ce1b99b1fcdf137c553f543eafe3ec7</param></service></servicedata> (No newline at EOF) ++++++ flux2-2.0.0.obscpio -> flux2-2.0.1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/.github/workflows/backport.yaml new/flux2-2.0.1/.github/workflows/backport.yaml --- old/flux2-2.0.0/.github/workflows/backport.yaml 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/.github/workflows/backport.yaml 2023-07-11 14:05:53.000000000 +0200 @@ -8,7 +8,8 @@ pull-request: runs-on: ubuntu-latest permissions: - contents: read + contents: write + pull-requests: write if: github.event.pull_request.state == 'closed' && github.event.pull_request.merged && (github.event_name != 'labeled' || startsWith('backport:', github.event.label.name)) steps: - name: Checkout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/.github/workflows/release.yaml new/flux2-2.0.1/.github/workflows/release.yaml --- old/flux2-2.0.0/.github/workflows/release.yaml 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/.github/workflows/release.yaml 2023-07-11 14:05:53.000000000 +0200 @@ -94,10 +94,10 @@ run: | set -euo pipefail - hashes=$(echo $ARTIFACTS | jq --raw-output '.[] | {name, "digest": (.extra.Digest // .extra.Checksum)} | select(.digest) | {digest} + {name} | join(" ") | sub("^sha256:";"")' | base64 -w0) + hashes=$(echo -E $ARTIFACTS | jq --raw-output '.[] | {name, "digest": (.extra.Digest // .extra.Checksum)} | select(.digest) | {digest} + {name} | join(" ") | sub("^sha256:";"")' | base64 -w0) echo "hashes=$hashes" >> $GITHUB_OUTPUT - image_url=fluxcd/flux-cli:${{ steps.prep.outputs.version }} + image_url=fluxcd/flux-cli:$GITHUB_REF_NAME echo "image_url=$image_url" >> $GITHUB_OUTPUT image_digest=$(docker buildx imagetools inspect ${image_url} --format '{{json .}}' | jq -r .manifest.digest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/cmd/flux/build_kustomization_test.go new/flux2-2.0.1/cmd/flux/build_kustomization_test.go --- old/flux2-2.0.0/cmd/flux/build_kustomization_test.go 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/cmd/flux/build_kustomization_test.go 2023-07-11 14:05:53.000000000 +0200 @@ -159,6 +159,7 @@ tmpl := map[string]string{ "fluxns": allocateNamespace("flux-system"), } + setup(t, tmpl) testEnv.CreateObjectFile("./testdata/build-kustomization/podinfo-source.yaml", tmpl, t) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/go.mod new/flux2-2.0.1/go.mod --- old/flux2-2.0.0/go.mod 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/go.mod 2023-07-11 14:05:53.000000000 +0200 @@ -7,28 +7,28 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec + github.com/ProtonMail/go-crypto v0.0.0-20230710112148-e01326fd72eb github.com/cyphar/filepath-securejoin v0.2.3 - github.com/distribution/distribution/v3 v3.0.0-20230629214736-bac7f02e02a1 + github.com/distribution/distribution/v3 v3.0.0-20230711080520-40ef2353fa4f github.com/fluxcd/go-git-providers v0.18.0 github.com/fluxcd/helm-controller/api v0.35.0 github.com/fluxcd/image-automation-controller/api v0.35.0 - github.com/fluxcd/image-reflector-controller/api v0.29.0 - github.com/fluxcd/kustomize-controller/api v1.0.0 + github.com/fluxcd/image-reflector-controller/api v0.29.1 + github.com/fluxcd/kustomize-controller/api v1.0.1 github.com/fluxcd/notification-controller/api v1.0.0 github.com/fluxcd/pkg/apis/event v0.5.1 github.com/fluxcd/pkg/apis/meta v1.1.1 github.com/fluxcd/pkg/git v0.12.3 github.com/fluxcd/pkg/git/gogit v0.12.1 github.com/fluxcd/pkg/kustomize v1.3.4 - github.com/fluxcd/pkg/oci v0.28.0 + github.com/fluxcd/pkg/oci v0.29.0 github.com/fluxcd/pkg/runtime v0.40.0 github.com/fluxcd/pkg/sourceignore v0.3.4 github.com/fluxcd/pkg/ssa v0.28.2 github.com/fluxcd/pkg/ssh v0.8.0 github.com/fluxcd/pkg/tar v0.2.0 github.com/fluxcd/pkg/version v0.2.2 - github.com/fluxcd/source-controller/api v1.0.0 + github.com/fluxcd/source-controller/api v1.0.1 github.com/go-git/go-git/v5 v5.7.0 github.com/go-logr/logr v1.2.4 github.com/gonvenience/bunt v1.3.5 @@ -45,8 +45,8 @@ github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/theckman/yacspin v0.13.12 - golang.org/x/crypto v0.10.0 - golang.org/x/term v0.9.0 + golang.org/x/crypto v0.11.0 + golang.org/x/term v0.10.0 k8s.io/api v0.27.3 k8s.io/apiextensions-apiserver v0.27.3 k8s.io/apimachinery v0.27.3 @@ -202,8 +202,8 @@ golang.org/x/net v0.11.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.9.0 // indirect - golang.org/x/text v0.10.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.10.0 // indirect gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/go.sum new/flux2-2.0.1/go.sum --- old/flux2-2.0.0/go.sum 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/go.sum 2023-07-11 14:05:53.000000000 +0200 @@ -23,8 +23,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec h1:vV3RryLxt42+ZIVOFbYJCH1jsZNTNmj2NYru5zfx+4E= -github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/ProtonMail/go-crypto v0.0.0-20230710112148-e01326fd72eb h1:RU+Ff2vE68zFQSoBqlb/LChFztEWWJ9EZ8LU4gA3ubU= +github.com/ProtonMail/go-crypto v0.0.0-20230710112148-e01326fd72eb/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= @@ -105,8 +105,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/distribution/distribution/v3 v3.0.0-20230629214736-bac7f02e02a1 h1:yRwt9RluqBtKyDLRY7J0Cf/TVqvG56vKx2Eyndy8qNQ= -github.com/distribution/distribution/v3 v3.0.0-20230629214736-bac7f02e02a1/go.mod h1:+fqBJ4vPYo4Uu1ZE4d+bUtTLRXfdSL3NvCZIZ9GHv58= +github.com/distribution/distribution/v3 v3.0.0-20230711080520-40ef2353fa4f h1:Df8k7piYnfycy7zSBLkN2oQaoIz1vw+msSgajUA+yKE= +github.com/distribution/distribution/v3 v3.0.0-20230711080520-40ef2353fa4f/go.mod h1:+fqBJ4vPYo4Uu1ZE4d+bUtTLRXfdSL3NvCZIZ9GHv58= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/docker/cli v23.0.5+incompatible h1:ufWmAOuD3Vmr7JP2G5K3cyuNC4YZWiAsuDEvFVVDafE= github.com/docker/cli v23.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= @@ -155,10 +155,10 @@ github.com/fluxcd/helm-controller/api v0.35.0/go.mod h1:CdHMtr5wM0xgDt/PS147H7QQS+zDxAFgDW3ZN8MnUlU= github.com/fluxcd/image-automation-controller/api v0.35.0 h1:B7yJdAbnx0hwI6ffVu0YAyc3d3sqjXrv6ySK++g3t28= github.com/fluxcd/image-automation-controller/api v0.35.0/go.mod h1:67HbnrXDy550zJKZZbzAZ0yfzL0Ge1O18yn/shcgy0Y= -github.com/fluxcd/image-reflector-controller/api v0.29.0 h1:Epzq0b2sYxgSwKPBN0BWEInQwMLsvU7sjqKJuzGtyIg= -github.com/fluxcd/image-reflector-controller/api v0.29.0/go.mod h1:aYwq15SpkAD/urQme2iEsNouTscfR1Qo39KBlJ+0EW8= -github.com/fluxcd/kustomize-controller/api v1.0.0 h1:BVz6lEpfGbny0ppQ82LloLSK0OoEGC51YQaw31j4vT8= -github.com/fluxcd/kustomize-controller/api v1.0.0/go.mod h1:rYUovoofr3bVPgQowWj/CSGw73qoH0tOCopJ3oNh7lM= +github.com/fluxcd/image-reflector-controller/api v0.29.1 h1:mnFaO60b8WyCxpc72utmAJ7J1ZtZjGGThH9NdxVeEyo= +github.com/fluxcd/image-reflector-controller/api v0.29.1/go.mod h1:aYwq15SpkAD/urQme2iEsNouTscfR1Qo39KBlJ+0EW8= +github.com/fluxcd/kustomize-controller/api v1.0.1 h1:zz9zx4Mc7rw9gqdgdhMWX1uDM2uR1x7WBUujKs4mdx8= +github.com/fluxcd/kustomize-controller/api v1.0.1/go.mod h1:rYUovoofr3bVPgQowWj/CSGw73qoH0tOCopJ3oNh7lM= github.com/fluxcd/notification-controller/api v1.0.0 h1:WiXS116pwhFp7Qe/Fc1GmKCfLBRnZu+rYCeIn07cO+4= github.com/fluxcd/notification-controller/api v1.0.0/go.mod h1:uamWZwmhSHE7xdJkgRhH4Eo5/SKKILFI4o+CoQjlczc= github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q= @@ -176,8 +176,8 @@ github.com/fluxcd/pkg/gittestserver v0.8.4 h1:rA/QUZnfH77ZZG+5xfMqjgEHJdzeeE6Nn1o8cops/bU= github.com/fluxcd/pkg/kustomize v1.3.4 h1:+XA4umfhkFqrNYQp3ZmKSJy4i3LWjbgoi6H4PllkkkA= github.com/fluxcd/pkg/kustomize v1.3.4/go.mod h1:nsbsNGe6nQY6DGYYPowFGQlhxFRcaRFvbwqhCbwAQuE= -github.com/fluxcd/pkg/oci v0.28.0 h1:E8VvMFzU/+9vgM4IFbiwmCwaMPCq1WXPiKUmHtDVSbc= -github.com/fluxcd/pkg/oci v0.28.0/go.mod h1:eFP5sQH4yWghFbcLWxdo0eI6wZ4h3HiTW0UoG33S2pg= +github.com/fluxcd/pkg/oci v0.29.0 h1:LACJNooDB4ZWVqRkB+V5MSPE04327DBbI/8BdWFzP8Y= +github.com/fluxcd/pkg/oci v0.29.0/go.mod h1:x91ESIQjUimZSElpJTVRx3yPFBmimvulni9iBsCwXlw= github.com/fluxcd/pkg/runtime v0.40.0 h1:uGiiEbMZwd7xmbKaVmcH7iilCFW9betWbz0r1taK3G0= github.com/fluxcd/pkg/runtime v0.40.0/go.mod h1:BqHEOVrZmt19p0q1OlGFWAYh3rZ28+IBpxLB2yPjjQ4= github.com/fluxcd/pkg/sourceignore v0.3.4 h1:0cfS2Pj7xp2qpaerMjYqOBr82LC+/mGHl6v6pRbi5hs= @@ -190,8 +190,8 @@ github.com/fluxcd/pkg/tar v0.2.0/go.mod h1:w0/TOC7kwBJhnSJn7TCABkc/I7ib1f2Yz6vOsbLBnhw= github.com/fluxcd/pkg/version v0.2.2 h1:ZpVXECeLA5hIQMft11iLp6gN3cKcz6UNuVTQPw/bRdI= github.com/fluxcd/pkg/version v0.2.2/go.mod h1:NGnh/no8S6PyfCDxRFrPY3T5BUnqP48MxfxNRU0z8C0= -github.com/fluxcd/source-controller/api v1.0.0 h1:lPjmCXmEiI3tY4pReeVQBMuyLgdH8462W5ewUa9kgYM= -github.com/fluxcd/source-controller/api v1.0.0/go.mod h1:rAY5FRFGZUKpIFNyYANHIgPgJPvbALBHWsq/zHw/cXQ= +github.com/fluxcd/source-controller/api v1.0.1 h1:nycylbNBnQd+EO4UHpqXqAQJ1cGAPxgBbrfERCQ1pp8= +github.com/fluxcd/source-controller/api v1.0.1/go.mod h1:rAY5FRFGZUKpIFNyYANHIgPgJPvbALBHWsq/zHw/cXQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -525,8 +525,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -605,16 +605,16 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -624,8 +624,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/internal/build/build.go new/flux2-2.0.1/internal/build/build.go --- old/flux2-2.0.0/internal/build/build.go 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/internal/build/build.go 2023-07-11 14:05:53.000000000 +0200 @@ -204,19 +204,36 @@ return b, nil } +func (b *Builder) resolveKustomization(liveKus *kustomizev1.Kustomization) (k *kustomizev1.Kustomization, err error) { + // local kustomization file takes precedence over live kustomization + if b.kustomizationFile != "" { + k, err = b.unMarshallKustomization() + if err != nil { + return + } + if !b.dryRun && liveKus != nil && liveKus.Status.Inventory != nil { + // merge the live kustomization status with the local kustomization in order to get the + // live resources status + k.Status = *liveKus.Status.DeepCopy() + } + } else { + k = liveKus + } + return +} + func (b *Builder) getKustomization(ctx context.Context) (*kustomizev1.Kustomization, error) { + liveKus := &kustomizev1.Kustomization{} namespacedName := types.NamespacedName{ Namespace: b.namespace, Name: b.name, } - - k := &kustomizev1.Kustomization{} - err := b.client.Get(ctx, namespacedName, k) + err := b.client.Get(ctx, namespacedName, liveKus) if err != nil { return nil, err } - return k, nil + return liveKus, nil } // Build builds the yaml manifests from the kustomization object @@ -251,19 +268,18 @@ defer cancel() // Get the kustomization object - var k *kustomizev1.Kustomization - if b.kustomizationFile != "" { - k, err = b.unMarshallKustomization() - if err != nil { - return - } - } else { - k, err = b.getKustomization(ctx) + liveKus := &kustomizev1.Kustomization{} + if !b.dryRun { + liveKus, err = b.getKustomization(ctx) if err != nil { - err = fmt.Errorf("failed to get kustomization object: %w", err) - return + return nil, fmt.Errorf("failed to get kustomization object: %w", err) } } + k, err := b.resolveKustomization(liveKus) + if err != nil { + err = fmt.Errorf("failed to get kustomization object: %w", err) + return + } // store the kustomization object b.kustomization = k diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/internal/build/build_test.go new/flux2-2.0.1/internal/build/build_test.go --- old/flux2-2.0.0/internal/build/build_test.go 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/internal/build/build_test.go 2023-07-11 14:05:53.000000000 +0200 @@ -17,10 +17,15 @@ package build import ( + "fmt" "strings" "testing" + "time" + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" + "github.com/fluxcd/pkg/apis/meta" "github.com/google/go-cmp/cmp" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/kyaml/yaml" ) @@ -213,5 +218,137 @@ } } }) + } +} + +func Test_ResolveKustomization(t *testing.T) { + tests := []struct { + name string + localKsFile string + liveKustomization *kustomizev1.Kustomization + dryrun bool + }{ + { + name: "valid kustomization", + localKsFile: "testdata/local-kustomization/valid.yaml", + }, + { + name: "local and live kustomization", + localKsFile: "testdata/local-kustomization/valid.yaml", + liveKustomization: &kustomizev1.Kustomization{ + ObjectMeta: metav1.ObjectMeta{ + Name: "podinfo", + Namespace: "flux-system", + }, + Spec: kustomizev1.KustomizationSpec{ + Interval: metav1.Duration{Duration: time.Minute * 5}, + Path: "./testdata/local-kustomization/valid.yaml", + }, + Status: kustomizev1.KustomizationStatus{ + Conditions: []metav1.Condition{ + { + Type: meta.ReadyCondition, + Status: metav1.ConditionTrue, + }, + }, + Inventory: &kustomizev1.ResourceInventory{ + Entries: []kustomizev1.ResourceRef{ + { + ID: "flux-system_podinfo_v1_service_podinfo", + Version: "v1", + }, + }, + }, + }, + }, + }, + { + name: "local and live kustomization with dryrun", + localKsFile: "testdata/local-kustomization/valid.yaml", + liveKustomization: &kustomizev1.Kustomization{ + ObjectMeta: metav1.ObjectMeta{ + Name: "podinfo", + Namespace: "flux-system", + }, + Spec: kustomizev1.KustomizationSpec{ + Interval: metav1.Duration{Duration: time.Minute * 5}, + Path: "./testdata/local-kustomization/valid.yaml", + }, + Status: kustomizev1.KustomizationStatus{ + Conditions: []metav1.Condition{ + { + Type: meta.ReadyCondition, + Status: metav1.ConditionTrue, + }, + }, + Inventory: &kustomizev1.ResourceInventory{ + Entries: []kustomizev1.ResourceRef{ + { + ID: "flux-system_podinfo_v1_service_podinfo", + Version: "v1", + }, + }, + }, + }, + }, + dryrun: true, + }, + { + name: "live kustomization", + liveKustomization: &kustomizev1.Kustomization{ + ObjectMeta: metav1.ObjectMeta{ + Name: "podinfo", + Namespace: "flux-system", + }, + Spec: kustomizev1.KustomizationSpec{ + Interval: metav1.Duration{Duration: time.Minute * 5}, + Path: "./testdata/local-kustomization/valid.yaml", + }, + Status: kustomizev1.KustomizationStatus{ + Conditions: []metav1.Condition{ + { + Type: meta.ReadyCondition, + Status: metav1.ConditionTrue, + }, + }, + Inventory: &kustomizev1.ResourceInventory{ + Entries: []kustomizev1.ResourceRef{ + { + ID: "flux-system_podinfo_v1_service_podinfo", + Version: "v1", + }, + }, + }, + }, + }, + }, + } + + b := &Builder{} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + b.kustomizationFile = tt.localKsFile + b.dryRun = tt.dryrun + ks, err := b.resolveKustomization(tt.liveKustomization) + if err != nil { + t.Errorf("unexpected err '%s'", err) + } + if !tt.dryrun { + if b.kustomizationFile == "" { + if cmp.Diff(ks, tt.liveKustomization) != "" { + t.Errorf("expected kustomization to match live kustomization") + } + } else { + if tt.liveKustomization != nil && cmp.Diff(ks.Status, tt.liveKustomization.Status) != "" { + t.Errorf("expected kustomization status to match live kustomization status") + } + } + } else { + if ks.Status.Inventory != nil { + fmt.Println(ks.Status.Inventory) + t.Errorf("expected kustomization status to be nil") + } + } + }) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/internal/build/diff.go new/flux2-2.0.1/internal/build/diff.go --- old/flux2-2.0.0/internal/build/diff.go 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/internal/build/diff.go 2023-07-11 14:05:53.000000000 +0200 @@ -136,11 +136,14 @@ if b.kustomization.Spec.Prune && len(diffErrs) == 0 { oldStatus := b.kustomization.Status.DeepCopy() if oldStatus.Inventory != nil { - diffObjects, err := diffInventory(oldStatus.Inventory, newInventory) + staleObjects, err := diffInventory(oldStatus.Inventory, newInventory) if err != nil { return "", createdOrDrifted, err } - for _, object := range diffObjects { + if len(staleObjects) > 0 { + createdOrDrifted = true + } + for _, object := range staleObjects { output.WriteString(writeString(fmt.Sprintf("⺠%s deleted\n", ssa.FmtUnstructured(object)), bunt.OrangeRed)) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/manifests/bases/image-reflector-controller/kustomization.yaml new/flux2-2.0.1/manifests/bases/image-reflector-controller/kustomization.yaml --- old/flux2-2.0.0/manifests/bases/image-reflector-controller/kustomization.yaml 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/manifests/bases/image-reflector-controller/kustomization.yaml 2023-07-11 14:05:53.000000000 +0200 @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.0/image-reflector-controller.crds.yaml -- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.0/image-reflector-controller.deployment.yaml +- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.1/image-reflector-controller.crds.yaml +- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.1/image-reflector-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/manifests/bases/kustomize-controller/kustomization.yaml new/flux2-2.0.1/manifests/bases/kustomize-controller/kustomization.yaml --- old/flux2-2.0.0/manifests/bases/kustomize-controller/kustomization.yaml 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/manifests/bases/kustomize-controller/kustomization.yaml 2023-07-11 14:05:53.000000000 +0200 @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.0/kustomize-controller.crds.yaml -- https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.0/kustomize-controller.deployment.yaml +- https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.1/kustomize-controller.crds.yaml +- https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.1/kustomize-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/manifests/bases/source-controller/kustomization.yaml new/flux2-2.0.1/manifests/bases/source-controller/kustomization.yaml --- old/flux2-2.0.0/manifests/bases/source-controller/kustomization.yaml 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/manifests/bases/source-controller/kustomization.yaml 2023-07-11 14:05:53.000000000 +0200 @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/source-controller/releases/download/v1.0.0/source-controller.crds.yaml -- https://github.com/fluxcd/source-controller/releases/download/v1.0.0/source-controller.deployment.yaml +- https://github.com/fluxcd/source-controller/releases/download/v1.0.1/source-controller.crds.yaml +- https://github.com/fluxcd/source-controller/releases/download/v1.0.1/source-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/manifests/crds/kustomization.yaml new/flux2-2.0.1/manifests/crds/kustomization.yaml --- old/flux2-2.0.0/manifests/crds/kustomization.yaml 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/manifests/crds/kustomization.yaml 2023-07-11 14:05:53.000000000 +0200 @@ -1,9 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/source-controller/releases/download/v1.0.0/source-controller.crds.yaml -- https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.0/kustomize-controller.crds.yaml +- https://github.com/fluxcd/source-controller/releases/download/v1.0.1/source-controller.crds.yaml +- https://github.com/fluxcd/kustomize-controller/releases/download/v1.0.1/kustomize-controller.crds.yaml - https://github.com/fluxcd/helm-controller/releases/download/v0.35.0/helm-controller.crds.yaml - https://github.com/fluxcd/notification-controller/releases/download/v1.0.0/notification-controller.crds.yaml -- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.0/image-reflector-controller.crds.yaml +- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.29.1/image-reflector-controller.crds.yaml - https://github.com/fluxcd/image-automation-controller/releases/download/v0.35.0/image-automation-controller.crds.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/tests/azure/go.mod new/flux2-2.0.1/tests/azure/go.mod --- old/flux2-2.0.0/tests/azure/go.mod 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/tests/azure/go.mod 2023-07-11 14:05:53.000000000 +0200 @@ -9,14 +9,14 @@ github.com/Azure/azure-event-hubs-go/v3 v3.6.0 github.com/fluxcd/helm-controller/api v0.35.0 github.com/fluxcd/image-automation-controller/api v0.35.0 - github.com/fluxcd/image-reflector-controller/api v0.29.0 - github.com/fluxcd/kustomize-controller/api v1.0.0 + github.com/fluxcd/image-reflector-controller/api v0.29.1 + github.com/fluxcd/kustomize-controller/api v1.0.1 github.com/fluxcd/notification-controller/api v1.0.0 github.com/fluxcd/pkg/apis/event v0.5.1 github.com/fluxcd/pkg/apis/meta v1.1.1 github.com/fluxcd/pkg/git v0.12.3 github.com/fluxcd/pkg/git/gogit v0.12.1 - github.com/fluxcd/source-controller/api v1.0.0 + github.com/fluxcd/source-controller/api v1.0.1 github.com/go-git/go-git/v5 v5.7.0 github.com/hashicorp/hc-install v0.5.2 github.com/hashicorp/terraform-exec v0.18.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flux2-2.0.0/tests/azure/go.sum new/flux2-2.0.1/tests/azure/go.sum --- old/flux2-2.0.0/tests/azure/go.sum 2023-07-04 17:03:22.000000000 +0200 +++ new/flux2-2.0.1/tests/azure/go.sum 2023-07-11 14:05:53.000000000 +0200 @@ -89,10 +89,10 @@ github.com/fluxcd/helm-controller/api v0.35.0/go.mod h1:CdHMtr5wM0xgDt/PS147H7QQS+zDxAFgDW3ZN8MnUlU= github.com/fluxcd/image-automation-controller/api v0.35.0 h1:B7yJdAbnx0hwI6ffVu0YAyc3d3sqjXrv6ySK++g3t28= github.com/fluxcd/image-automation-controller/api v0.35.0/go.mod h1:67HbnrXDy550zJKZZbzAZ0yfzL0Ge1O18yn/shcgy0Y= -github.com/fluxcd/image-reflector-controller/api v0.29.0 h1:Epzq0b2sYxgSwKPBN0BWEInQwMLsvU7sjqKJuzGtyIg= -github.com/fluxcd/image-reflector-controller/api v0.29.0/go.mod h1:aYwq15SpkAD/urQme2iEsNouTscfR1Qo39KBlJ+0EW8= -github.com/fluxcd/kustomize-controller/api v1.0.0 h1:BVz6lEpfGbny0ppQ82LloLSK0OoEGC51YQaw31j4vT8= -github.com/fluxcd/kustomize-controller/api v1.0.0/go.mod h1:rYUovoofr3bVPgQowWj/CSGw73qoH0tOCopJ3oNh7lM= +github.com/fluxcd/image-reflector-controller/api v0.29.1 h1:mnFaO60b8WyCxpc72utmAJ7J1ZtZjGGThH9NdxVeEyo= +github.com/fluxcd/image-reflector-controller/api v0.29.1/go.mod h1:aYwq15SpkAD/urQme2iEsNouTscfR1Qo39KBlJ+0EW8= +github.com/fluxcd/kustomize-controller/api v1.0.1 h1:zz9zx4Mc7rw9gqdgdhMWX1uDM2uR1x7WBUujKs4mdx8= +github.com/fluxcd/kustomize-controller/api v1.0.1/go.mod h1:rYUovoofr3bVPgQowWj/CSGw73qoH0tOCopJ3oNh7lM= github.com/fluxcd/notification-controller/api v1.0.0 h1:WiXS116pwhFp7Qe/Fc1GmKCfLBRnZu+rYCeIn07cO+4= github.com/fluxcd/notification-controller/api v1.0.0/go.mod h1:uamWZwmhSHE7xdJkgRhH4Eo5/SKKILFI4o+CoQjlczc= github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q= @@ -112,8 +112,8 @@ github.com/fluxcd/pkg/ssh v0.8.0/go.mod h1:bo6HgWqIIuXU6r5HCxRFa7Uo7b4Nnzsz6MvdtAYn2XY= github.com/fluxcd/pkg/version v0.2.2 h1:ZpVXECeLA5hIQMft11iLp6gN3cKcz6UNuVTQPw/bRdI= github.com/fluxcd/pkg/version v0.2.2/go.mod h1:NGnh/no8S6PyfCDxRFrPY3T5BUnqP48MxfxNRU0z8C0= -github.com/fluxcd/source-controller/api v1.0.0 h1:lPjmCXmEiI3tY4pReeVQBMuyLgdH8462W5ewUa9kgYM= -github.com/fluxcd/source-controller/api v1.0.0/go.mod h1:rAY5FRFGZUKpIFNyYANHIgPgJPvbALBHWsq/zHw/cXQ= +github.com/fluxcd/source-controller/api v1.0.1 h1:nycylbNBnQd+EO4UHpqXqAQJ1cGAPxgBbrfERCQ1pp8= +github.com/fluxcd/source-controller/api v1.0.1/go.mod h1:rAY5FRFGZUKpIFNyYANHIgPgJPvbALBHWsq/zHw/cXQ= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= ++++++ flux2.obsinfo ++++++ --- /var/tmp/diff_new_pack.i1iPRt/_old 2023-07-12 17:28:04.150800954 +0200 +++ /var/tmp/diff_new_pack.i1iPRt/_new 2023-07-12 17:28:04.154800982 +0200 @@ -1,5 +1,5 @@ name: flux2 -version: 2.0.0 -mtime: 1688483002 -commit: 9ea0a535eab2c99121fb3ac742e333b4a9f07970 +version: 2.0.1 +mtime: 1689077153 +commit: 9b3162495ce1b99b1fcdf137c553f543eafe3ec7 ++++++ image-reflector-controller.deployment.yaml ++++++ --- /var/tmp/diff_new_pack.i1iPRt/_old 2023-07-12 17:28:04.262801730 +0200 +++ /var/tmp/diff_new_pack.i1iPRt/_new 2023-07-12 17:28:04.266801757 +0200 @@ -28,7 +28,7 @@ valueFrom: fieldRef: fieldPath: metadata.namespace - image: fluxcd/image-reflector-controller:v0.29.0 + image: fluxcd/image-reflector-controller:v0.29.1 imagePullPolicy: IfNotPresent livenessProbe: httpGet: ++++++ kustomize-controller.deployment.yaml ++++++ --- /var/tmp/diff_new_pack.i1iPRt/_old 2023-07-12 17:28:04.310802062 +0200 +++ /var/tmp/diff_new_pack.i1iPRt/_new 2023-07-12 17:28:04.314802090 +0200 @@ -28,7 +28,7 @@ valueFrom: fieldRef: fieldPath: metadata.namespace - image: fluxcd/kustomize-controller:v1.0.0 + image: fluxcd/kustomize-controller:v1.0.1 imagePullPolicy: IfNotPresent livenessProbe: httpGet: ++++++ source-controller.deployment.yaml ++++++ --- /var/tmp/diff_new_pack.i1iPRt/_old 2023-07-12 17:28:04.398802671 +0200 +++ /var/tmp/diff_new_pack.i1iPRt/_new 2023-07-12 17:28:04.398802671 +0200 @@ -50,7 +50,7 @@ fieldPath: metadata.namespace - name: TUF_ROOT value: /tmp/.sigstore - image: fluxcd/source-controller:v1.0.0 + image: fluxcd/source-controller:v1.0.1 imagePullPolicy: IfNotPresent livenessProbe: httpGet: ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/flux2-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.flux2-cli.new.8922/vendor.tar.gz differ: char 5, line 1
