Update controllers to OCI preview images

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
fluxcd · Jun 22, 2022 · 1c72b90 · 1c72b90
1 parent 5f2dcf0
commit 1c72b90
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -10,7 +10,8 @@ require (
 	github.com/fluxcd/helm-controller/api v0.22.1
 	github.com/fluxcd/image-automation-controller/api v0.23.2
 	github.com/fluxcd/image-reflector-controller/api v0.19.1
-	github.com/fluxcd/kustomize-controller/api v0.26.1
+	// TODO: update KC API when OCIRepository is released
+	github.com/fluxcd/kustomize-controller/api v0.26.2-0.20220621190919-7681bda98076
 	github.com/fluxcd/notification-controller/api v0.24.0
 	github.com/fluxcd/pkg/apis/meta v0.14.2
 	github.com/fluxcd/pkg/kustomize v0.5.2
@@ -19,7 +20,8 @@ require (
 	github.com/fluxcd/pkg/ssh v0.5.0
 	github.com/fluxcd/pkg/untar v0.1.0
 	github.com/fluxcd/pkg/version v0.1.0
-	github.com/fluxcd/source-controller/api v0.25.5
+	// TODO: update SC API when OCIRepository is released
+	github.com/fluxcd/source-controller/api v0.25.7-0.20220621184627-37a7bc513333
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/gonvenience/bunt v1.3.4
 	github.com/gonvenience/ytbx v1.4.4

diff --git a/go.sum b/go.sum
@@ -264,8 +264,8 @@ github.com/fluxcd/image-automation-controller/api v0.23.2 h1:2e5ZWaKUGzCD7ItxQDb
 github.com/fluxcd/image-automation-controller/api v0.23.2/go.mod h1:HhjBfqtjsb+Pe5S4ig2cq3n25Rifs8NJ+bppf++Bmb8=
 github.com/fluxcd/image-reflector-controller/api v0.19.1 h1:5vEHLVhgxdznn6AfwMea5Bi/qsuIsjiV3goj3pg4FcI=
 github.com/fluxcd/image-reflector-controller/api v0.19.1/go.mod h1:WvPujFOXzWttkETUxkCgP9BesCTAfVYzgCeZXu43nY4=
-github.com/fluxcd/kustomize-controller/api v0.26.1 h1:hX8vPe49/ytKzSAO8Qewb/Cmswt8oit/JNIQ9h5l+xQ=
-github.com/fluxcd/kustomize-controller/api v0.26.1/go.mod h1:f16v3IErWGQJ0WXtpOW3ATjFukz/KhbkanqS9ZTM8ks=
+github.com/fluxcd/kustomize-controller/api v0.26.2-0.20220621190919-7681bda98076 h1:rsvWmqJTWRYb/DJvKA5QH6P8ctNZaH5TCg7rM/8qmec=
+github.com/fluxcd/kustomize-controller/api v0.26.2-0.20220621190919-7681bda98076/go.mod h1:f16v3IErWGQJ0WXtpOW3ATjFukz/KhbkanqS9ZTM8ks=
 github.com/fluxcd/notification-controller/api v0.24.0 h1:pvLcCD1HT+x0Hup8VLfDrVGFDK33oJKNC7WX6mtEEh0=
 github.com/fluxcd/notification-controller/api v0.24.0/go.mod h1:pld1fyodxqdWPBr+Ez+kTixmtmO2o3o0I5Zf5wQDHGM=
 github.com/fluxcd/pkg/apis/acl v0.0.3 h1:Lw0ZHdpnO4G7Zy9KjrzwwBmDZQuy4qEjaU/RvA6k1lc=
@@ -286,8 +286,8 @@ github.com/fluxcd/pkg/untar v0.1.0 h1:k97V/xV5hFrAkIkVPuv5AVhyxh1ZzzAKba/lbDfGo6
 github.com/fluxcd/pkg/untar v0.1.0/go.mod h1:aGswNyzB1mlz/T/kpOS58mITBMxMKc9tlJBH037A2HY=
 github.com/fluxcd/pkg/version v0.1.0 h1:v+SmCanmCB5Tj2Cx9TXlj+kNRfPGbAvirkeqsp7ZEAQ=
 github.com/fluxcd/pkg/version v0.1.0/go.mod h1:V7Z/w8dxLQzv0FHqa5ox5TeyOd2zOd49EeuWFgnwyj4=
-github.com/fluxcd/source-controller/api v0.25.5 h1:64rLb5cuHhZ3LcRIxkp+/oAVCyVtjOhQ9kbphdFfR/s=
-github.com/fluxcd/source-controller/api v0.25.5/go.mod h1:/e7YRDOqb8z8I3N8ifbDF1mknf8zFsoADtS/Q93iWPs=
+github.com/fluxcd/source-controller/api v0.25.7-0.20220621184627-37a7bc513333 h1:SRZI1dfSzZghtSVoKYl6rt4NDNeFZR2YnOmQ8GfM/+E=
+github.com/fluxcd/source-controller/api v0.25.7-0.20220621184627-37a7bc513333/go.mod h1:/e7YRDOqb8z8I3N8ifbDF1mknf8zFsoADtS/Q93iWPs=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c=

diff --git a/manifests/bases/kustomize-controller/kustomization.yaml b/manifests/bases/kustomize-controller/kustomization.yaml
@@ -1,7 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+# TODO: remove the hardcoded branch when OCIRepository is released
 resources:
-- https://github.com/fluxcd/kustomize-controller/releases/download/v0.26.1/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/config/crd?ref=oci
 - https://github.com/fluxcd/kustomize-controller/releases/download/v0.26.1/kustomize-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
@@ -11,3 +12,7 @@ patchesJson6902:
     kind: Deployment
     name: kustomize-controller
   path: patch.yaml
+# TODO: remove the hardcoded image when OCIRepository is released
+images:
+  - name: fluxcd/kustomize-controller
+    newTag: oci-7681bda9
diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml
@@ -1,7 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+# TODO: remove the hardcoded branch when OCIRepository is released
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v0.25.5/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/config/crd?ref=oci
 - https://github.com/fluxcd/source-controller/releases/download/v0.25.5/source-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
@@ -11,3 +12,7 @@ patchesJson6902:
     kind: Deployment
     name: source-controller
   path: patch.yaml
+# TODO: remove the hardcoded image when OCIRepository is released
+images:
+  - name: fluxcd/source-controller
+    newTag: oci-778f6d5d