diff --git a/.github/workflows/e2e-bootstrap.yaml b/.github/workflows/e2e-bootstrap.yaml index 2d7b8736..32e93aaf 100644 --- a/.github/workflows/e2e-bootstrap.yaml +++ b/.github/workflows/e2e-bootstrap.yaml @@ -105,6 +105,7 @@ jobs: --path=test-cluster \ --read-write-key ./bin/flux reconcile image repository podinfo + ./bin/flux reconcile image policy podinfo ./bin/flux reconcile image update flux-system ./bin/flux get images all ./bin/flux -n flux-system events --for ImageUpdateAutomation/flux-system diff --git a/go.mod b/go.mod index 69ea22bf..fedeca16 100644 --- a/go.mod +++ b/go.mod @@ -12,11 +12,11 @@ require ( github.com/distribution/distribution/v3 v3.0.0 github.com/fluxcd/cli-utils v0.36.0-flux.15 github.com/fluxcd/go-git-providers v0.24.0 - github.com/fluxcd/helm-controller/api v1.4.2 - github.com/fluxcd/image-automation-controller/api v1.0.2 - github.com/fluxcd/image-reflector-controller/api v1.0.2 - github.com/fluxcd/kustomize-controller/api v1.7.1 - github.com/fluxcd/notification-controller/api v1.7.3 + github.com/fluxcd/helm-controller/api v1.4.3 + github.com/fluxcd/image-automation-controller/api v1.0.3 + github.com/fluxcd/image-reflector-controller/api v1.0.3 + github.com/fluxcd/kustomize-controller/api v1.7.2 + github.com/fluxcd/notification-controller/api v1.7.4 github.com/fluxcd/pkg/apis/event v0.20.0 github.com/fluxcd/pkg/apis/meta v1.22.0 github.com/fluxcd/pkg/auth v0.32.0 @@ -32,7 +32,7 @@ require ( github.com/fluxcd/pkg/ssh v0.22.0 github.com/fluxcd/pkg/tar v0.15.0 github.com/fluxcd/pkg/version v0.11.0 - github.com/fluxcd/source-controller/api v1.7.2 + github.com/fluxcd/source-controller/api v1.7.3 github.com/fluxcd/source-watcher/api/v2 v2.0.2 github.com/go-git/go-git/v5 v5.16.3 github.com/go-logr/logr v1.4.3 diff --git a/go.sum b/go.sum index 58bacd61..8c55fd76 100644 --- a/go.sum +++ b/go.sum @@ -174,16 +174,16 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg= github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo= github.com/fluxcd/go-git-providers v0.24.0 h1:g+96IxOG1g0kf/DOFUFMkz1MtKvG5aeqmkIqmRBY1qU= github.com/fluxcd/go-git-providers v0.24.0/go.mod h1:RH1ei52TOdIb/GgPd22tr7kIuPD/xc8XTy5sKpV9xM8= -github.com/fluxcd/helm-controller/api v1.4.2 h1:2+D3kX3UJhYlr+1rzOkQ/YbIQ96R/olmdfjaYS+okNg= -github.com/fluxcd/helm-controller/api v1.4.2/go.mod h1:0XrBhKEaqvxyDj/FziG1Q8Fmx2UATdaqLgYqmZh6wW4= -github.com/fluxcd/image-automation-controller/api v1.0.2 h1:S4OiGcUlnpIVloqqNACb/HO0pmGwGBCE50vJEGnv2s8= -github.com/fluxcd/image-automation-controller/api v1.0.2/go.mod h1:dY6YiBQFU00SE7erlk5ckHxjzfIbsvgTD50k409QgDo= -github.com/fluxcd/image-reflector-controller/api v1.0.2 h1:1Aty0YUJw4jVTCp3enEhMiQCISmr1nQz3TbrQfaejL4= -github.com/fluxcd/image-reflector-controller/api v1.0.2/go.mod h1:PkzL5wY8s5UZxfr5kpnWf/nI/QZKpSAxr1ewFHNEfgA= -github.com/fluxcd/kustomize-controller/api v1.7.1 h1:wFevRoziJcQEcJtNL2/NrQfAA1lrrOnFSmFIZrBBfBc= -github.com/fluxcd/kustomize-controller/api v1.7.1/go.mod h1:77OSly9kxQli7Nmcln0OqZDjVpRMc6eLKED0CiJHYz8= -github.com/fluxcd/notification-controller/api v1.7.3 h1:6x+27zo97P3VFYU5WGPN7jWLIYkCErTfvI6FTlXdB2g= -github.com/fluxcd/notification-controller/api v1.7.3/go.mod h1:Q1TwKHYFaAsYAcnmkzJ4ocZ6QS3CXcPOx9/aVXNUpNw= +github.com/fluxcd/helm-controller/api v1.4.3 h1:CdZwjL1liXmYCWyk2jscmFEB59tICIlnWB9PfDDW5q4= +github.com/fluxcd/helm-controller/api v1.4.3/go.mod h1:0XrBhKEaqvxyDj/FziG1Q8Fmx2UATdaqLgYqmZh6wW4= +github.com/fluxcd/image-automation-controller/api v1.0.3 h1:YfdkrRTIjLmmP58Xow/9bbs1tPU7WBo6Xon1PHbDCgM= +github.com/fluxcd/image-automation-controller/api v1.0.3/go.mod h1:dY6YiBQFU00SE7erlk5ckHxjzfIbsvgTD50k409QgDo= +github.com/fluxcd/image-reflector-controller/api v1.0.3 h1:OFI+kJ0fZKAT0MmkGA3c2N7bnU98De3d/T1F1XKCY+k= +github.com/fluxcd/image-reflector-controller/api v1.0.3/go.mod h1:PkzL5wY8s5UZxfr5kpnWf/nI/QZKpSAxr1ewFHNEfgA= +github.com/fluxcd/kustomize-controller/api v1.7.2 h1:E+UwgztwYCwgOgpMuIZZfntCEYIer+hl2NH5O+tL8hs= +github.com/fluxcd/kustomize-controller/api v1.7.2/go.mod h1:77OSly9kxQli7Nmcln0OqZDjVpRMc6eLKED0CiJHYz8= +github.com/fluxcd/notification-controller/api v1.7.4 h1:nYcr/6n6TCB6Ga3q7u5U+Y5SWgVv+UHYRXXz27ne1fQ= +github.com/fluxcd/notification-controller/api v1.7.4/go.mod h1:Q1TwKHYFaAsYAcnmkzJ4ocZ6QS3CXcPOx9/aVXNUpNw= github.com/fluxcd/pkg/apis/acl v0.9.0 h1:wBpgsKT+jcyZEcM//OmZr9RiF8klL3ebrDp2u2ThsnA= github.com/fluxcd/pkg/apis/acl v0.9.0/go.mod h1:TttNS+gocsGLwnvmgVi3/Yscwqrjc17+vhgYfqkfrV4= github.com/fluxcd/pkg/apis/event v0.20.0 h1:Vxd1kkS/CsQNPHTbmlL4qOcCmUmavEtaEOod2yJsBVU= @@ -222,8 +222,8 @@ github.com/fluxcd/pkg/tar v0.15.0 h1:xoMLngTahZ0/j3CgM/9sLw1F0PkDwiZCRbu6hYxx0Gw github.com/fluxcd/pkg/tar v0.15.0/go.mod h1:54zTMvJG+aWdoLcuhD2plTVODgxl5/w+mnoDVCcU34Y= github.com/fluxcd/pkg/version v0.11.0 h1:gcAXw/HZ4XX9v+2xhO+NWf/hAArYKgSmzqT9Yrx4VjY= github.com/fluxcd/pkg/version v0.11.0/go.mod h1:XsgsKJVmVFWnG3DE19YBM0EeWVuG4BPAHpAmOe6GFmo= -github.com/fluxcd/source-controller/api v1.7.2 h1:/lg/xoyRjxwdhHKqjTxQS2o1cp+DMKJ8W4rpm+ZLemQ= -github.com/fluxcd/source-controller/api v1.7.2/go.mod h1:2JtCeUVpl0aqKImS19jUz9EEnMdzgqNWHkllrIhV004= +github.com/fluxcd/source-controller/api v1.7.3 h1:JCDbaJqAbQtjCt3Ijsm/6nZf+SZiby3/R6lVZ1gDllE= +github.com/fluxcd/source-controller/api v1.7.3/go.mod h1:2JtCeUVpl0aqKImS19jUz9EEnMdzgqNWHkllrIhV004= github.com/fluxcd/source-watcher/api/v2 v2.0.2 h1:fWSxsDqYN7My2AEpQwbP7O6Qjix8nGBX+UE/qWHtZfM= github.com/fluxcd/source-watcher/api/v2 v2.0.2/go.mod h1:Hs6ueayPt23jlkIr/d1pGPZ+OHiibQwWjxvU6xqljzg= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= diff --git a/manifests/bases/helm-controller/kustomization.yaml b/manifests/bases/helm-controller/kustomization.yaml index d76f5f44..7982b15d 100644 --- a/manifests/bases/helm-controller/kustomization.yaml +++ b/manifests/bases/helm-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/helm-controller/releases/download/v1.4.2/helm-controller.crds.yaml -- https://github.com/fluxcd/helm-controller/releases/download/v1.4.2/helm-controller.deployment.yaml +- https://github.com/fluxcd/helm-controller/releases/download/v1.4.3/helm-controller.crds.yaml +- https://github.com/fluxcd/helm-controller/releases/download/v1.4.3/helm-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff --git a/manifests/bases/image-automation-controller/kustomization.yaml b/manifests/bases/image-automation-controller/kustomization.yaml index e02572fb..138d0e0c 100644 --- a/manifests/bases/image-automation-controller/kustomization.yaml +++ b/manifests/bases/image-automation-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/image-automation-controller/releases/download/v1.0.2/image-automation-controller.crds.yaml -- https://github.com/fluxcd/image-automation-controller/releases/download/v1.0.2/image-automation-controller.deployment.yaml +- https://github.com/fluxcd/image-automation-controller/releases/download/v1.0.3/image-automation-controller.crds.yaml +- https://github.com/fluxcd/image-automation-controller/releases/download/v1.0.3/image-automation-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff --git a/manifests/bases/image-reflector-controller/kustomization.yaml b/manifests/bases/image-reflector-controller/kustomization.yaml index fd26fd93..10e47a86 100644 --- a/manifests/bases/image-reflector-controller/kustomization.yaml +++ b/manifests/bases/image-reflector-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.0.2/image-reflector-controller.crds.yaml -- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.0.2/image-reflector-controller.deployment.yaml +- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.0.3/image-reflector-controller.crds.yaml +- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.0.3/image-reflector-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff --git a/manifests/bases/kustomize-controller/kustomization.yaml b/manifests/bases/kustomize-controller/kustomization.yaml index 396007ed..cd65c5e5 100644 --- a/manifests/bases/kustomize-controller/kustomization.yaml +++ b/manifests/bases/kustomize-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/kustomize-controller/releases/download/v1.7.1/kustomize-controller.crds.yaml -- https://github.com/fluxcd/kustomize-controller/releases/download/v1.7.1/kustomize-controller.deployment.yaml +- https://github.com/fluxcd/kustomize-controller/releases/download/v1.7.2/kustomize-controller.crds.yaml +- https://github.com/fluxcd/kustomize-controller/releases/download/v1.7.2/kustomize-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff --git a/manifests/bases/notification-controller/kustomization.yaml b/manifests/bases/notification-controller/kustomization.yaml index c6edae6b..02b14578 100644 --- a/manifests/bases/notification-controller/kustomization.yaml +++ b/manifests/bases/notification-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/notification-controller/releases/download/v1.7.3/notification-controller.crds.yaml -- https://github.com/fluxcd/notification-controller/releases/download/v1.7.3/notification-controller.deployment.yaml +- https://github.com/fluxcd/notification-controller/releases/download/v1.7.4/notification-controller.crds.yaml +- https://github.com/fluxcd/notification-controller/releases/download/v1.7.4/notification-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml index 0ab4d94a..af96db01 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/v1.7.2/source-controller.crds.yaml -- https://github.com/fluxcd/source-controller/releases/download/v1.7.2/source-controller.deployment.yaml +- https://github.com/fluxcd/source-controller/releases/download/v1.7.3/source-controller.crds.yaml +- https://github.com/fluxcd/source-controller/releases/download/v1.7.3/source-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff --git a/manifests/crds/kustomization.yaml b/manifests/crds/kustomization.yaml index b1bcecb0..5e2854a6 100644 --- a/manifests/crds/kustomization.yaml +++ b/manifests/crds/kustomization.yaml @@ -1,10 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/source-controller/releases/download/v1.7.2/source-controller.crds.yaml -- https://github.com/fluxcd/kustomize-controller/releases/download/v1.7.1/kustomize-controller.crds.yaml -- https://github.com/fluxcd/helm-controller/releases/download/v1.4.2/helm-controller.crds.yaml -- https://github.com/fluxcd/notification-controller/releases/download/v1.7.3/notification-controller.crds.yaml -- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.0.2/image-reflector-controller.crds.yaml -- https://github.com/fluxcd/image-automation-controller/releases/download/v1.0.2/image-automation-controller.crds.yaml +- https://github.com/fluxcd/source-controller/releases/download/v1.7.3/source-controller.crds.yaml +- https://github.com/fluxcd/kustomize-controller/releases/download/v1.7.2/kustomize-controller.crds.yaml +- https://github.com/fluxcd/helm-controller/releases/download/v1.4.3/helm-controller.crds.yaml +- https://github.com/fluxcd/notification-controller/releases/download/v1.7.4/notification-controller.crds.yaml +- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.0.3/image-reflector-controller.crds.yaml +- https://github.com/fluxcd/image-automation-controller/releases/download/v1.0.3/image-automation-controller.crds.yaml - https://github.com/fluxcd/source-watcher/releases/download/v2.0.2/source-watcher.crds.yaml