diff --git a/go.mod b/go.mod index 4f2e22b4..a5f183dd 100644 --- 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.4 github.com/fluxcd/image-reflector-controller/api v0.19.2 - github.com/fluxcd/kustomize-controller/api v0.26.2 + // 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.9 + // TODO: update SC API when OCIRepository is released + github.com/fluxcd/source-controller/api v0.25.8 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 index ef9e7692..c6f2a982 100644 --- a/go.sum +++ b/go.sum @@ -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.9 h1:hdaBYYNuW3qTcXRMfrxO5paK+UVFL9ApZS495nd7K2w= -github.com/fluxcd/source-controller/api v0.25.9/go.mod h1:/e7YRDOqb8z8I3N8ifbDF1mknf8zFsoADtS/Q93iWPs= +github.com/fluxcd/source-controller/api v0.25.8 h1:5/zxan8aWP03Pfk4Mj1YvFE55s6+TmohVDs1UQFdd9c= +github.com/fluxcd/source-controller/api v0.25.8/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 index 47f182a3..2ae59c8a 100644 --- a/manifests/bases/kustomize-controller/kustomization.yaml +++ b/manifests/bases/kustomize-controller/kustomization.yaml @@ -1,8 +1,9 @@ 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.2/kustomize-controller.crds.yaml -- https://github.com/fluxcd/kustomize-controller/releases/download/v0.26.2/kustomize-controller.deployment.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: - target: @@ -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 index 00ef3d73..29147274 100644 --- a/manifests/bases/source-controller/kustomization.yaml +++ b/manifests/bases/source-controller/kustomization.yaml @@ -1,8 +1,9 @@ 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.9/source-controller.crds.yaml -- https://github.com/fluxcd/source-controller/releases/download/v0.25.9/source-controller.deployment.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: - target: @@ -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