From c664484fda886acb12aaa8d6eb5dea7ee3cb1e83 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Thu, 16 Jul 2020 11:30:45 +0300 Subject: [PATCH] Update controllers and go modules - update source-controller to v0.0.5 - update kustomize-controller to v0.0.4 - update notification-controller to v0.0.4 - update helm-controller to v0.0.1-alpha.2 --- cmd/tk/bootstrap.go | 8 +++----- cmd/tk/create_kustomization.go | 8 +++----- go.mod | 6 +++--- go.sum | 16 ++++++++-------- .../bases/helm-controller/kustomization.yaml | 4 ++-- .../kustomize-controller/kustomization.yaml | 4 ++-- .../notification-controller/kustomization.yaml | 4 ++-- .../bases/source-controller/kustomization.yaml | 4 ++-- 8 files changed, 25 insertions(+), 29 deletions(-) diff --git a/cmd/tk/bootstrap.go b/cmd/tk/bootstrap.go index 695383db..82aa1b28 100644 --- a/cmd/tk/bootstrap.go +++ b/cmd/tk/bootstrap.go @@ -141,7 +141,6 @@ func generateSyncManifests(url, name, namespace, targetPath, tmpDir string, inte } gvk = kustomizev1.GroupVersion.WithKind("Kustomization") - emptyAPIGroup := "" kustomization := kustomizev1.Kustomization{ TypeMeta: metav1.TypeMeta{ Kind: gvk.Kind, @@ -157,10 +156,9 @@ func generateSyncManifests(url, name, namespace, targetPath, tmpDir string, inte }, Path: fmt.Sprintf("./%s", strings.TrimPrefix(targetPath, "./")), Prune: true, - SourceRef: corev1.TypedLocalObjectReference{ - APIGroup: &emptyAPIGroup, - Kind: "GitRepository", - Name: name, + SourceRef: kustomizev1.CrossNamespaceObjectReference{ + Kind: sourcev1.GitRepositoryKind, + Name: name, }, }, } diff --git a/cmd/tk/create_kustomization.go b/cmd/tk/create_kustomization.go index 2319eea9..512dc14c 100644 --- a/cmd/tk/create_kustomization.go +++ b/cmd/tk/create_kustomization.go @@ -125,7 +125,6 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error { logger.Generatef("generating kustomization") } - emptyAPIGroup := "" kustomization := kustomizev1.Kustomization{ ObjectMeta: metav1.ObjectMeta{ Name: name, @@ -138,10 +137,9 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error { }, Path: ksPath, Prune: ksPrune, - SourceRef: corev1.TypedLocalObjectReference{ - APIGroup: &emptyAPIGroup, - Kind: "GitRepository", - Name: ksSource, + SourceRef: kustomizev1.CrossNamespaceObjectReference{ + Kind: sourcev1.GitRepositoryKind, + Name: ksSource, }, Suspend: false, Validation: ksValidate, diff --git a/go.mod b/go.mod index b6b9cc55..9bb783a9 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.14 require ( github.com/blang/semver v3.5.1+incompatible - github.com/fluxcd/helm-controller v0.0.1-alpha.1 - github.com/fluxcd/kustomize-controller v0.0.3 + github.com/fluxcd/helm-controller v0.0.1-alpha.2 + github.com/fluxcd/kustomize-controller v0.0.4 github.com/fluxcd/pkg v0.0.3 github.com/fluxcd/source-controller v0.0.5 github.com/golang/protobuf v1.4.2 // indirect @@ -20,7 +20,7 @@ require ( k8s.io/apimachinery v0.18.4 k8s.io/client-go v0.18.4 sigs.k8s.io/controller-runtime v0.6.0 - sigs.k8s.io/kustomize/api v0.5.0 + sigs.k8s.io/kustomize/api v0.5.1 sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 68e33989..65f174e0 100644 --- a/go.sum +++ b/go.sum @@ -170,10 +170,10 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwC github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/helm-controller v0.0.1-alpha.1 h1:stbyNQdAhHqjL2i+Oi85A5cceOnatt20/fcNc0taeHA= -github.com/fluxcd/helm-controller v0.0.1-alpha.1/go.mod h1:ya+BGrB1Md5DaxQIQmXwf6qNaydZZoa3EZJGpqFFu/Y= -github.com/fluxcd/kustomize-controller v0.0.3 h1:oJJo+GNMfmuxg9M/TXkNui2AtV+oxaX/ZNI+33AuJHU= -github.com/fluxcd/kustomize-controller v0.0.3/go.mod h1:mOBo09pl4BKZP0DPFoijgsjReMNFLSznYMuKbwqqpOU= +github.com/fluxcd/helm-controller v0.0.1-alpha.2 h1:X5ycFeobLnv8EHVWC8hvw0fT6QZhbmM8y2ShM1XF4mk= +github.com/fluxcd/helm-controller v0.0.1-alpha.2/go.mod h1:ya+BGrB1Md5DaxQIQmXwf6qNaydZZoa3EZJGpqFFu/Y= +github.com/fluxcd/kustomize-controller v0.0.4 h1:QZNygZXWeM5nOn0iRmzOaaoXvQuZ+YZhx+QgZjuX2z0= +github.com/fluxcd/kustomize-controller v0.0.4/go.mod h1:JU62CExAWDlITSfLabTe7ilsq1DnJB3yaffv80nYlVs= github.com/fluxcd/pkg v0.0.3 h1:yhjtpGtD9LxFo8JtwTuUxJyFcX2wSSb0TPptIEpGSmA= github.com/fluxcd/pkg v0.0.3/go.mod h1:rtlppQU+9DNikyDZptLdOeTf+wBvQQiQQ/J113FPoeU= github.com/fluxcd/source-controller v0.0.5 h1:flUhdZh00/+jzqf9/sSRUMrewp+VlNFDITnoQC7pO4A= @@ -1002,10 +1002,10 @@ sigs.k8s.io/controller-runtime v0.6.0 h1:Fzna3DY7c4BIP6KwfSlrfnj20DJ+SeMBK8HSFvO sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= -sigs.k8s.io/kustomize/api v0.5.0 h1:LT/Yxm6J8M9BJoLxfYIwGWamvuGSPQl7ELQXdlOR/fY= -sigs.k8s.io/kustomize/api v0.5.0/go.mod h1:OND6MoJxF5BoS3IiAqDjPKdI7c+oTSaxuXKbljPbwNU= -sigs.k8s.io/kustomize/kyaml v0.3.4 h1:RhxnabYltv4mdD5+I7pIaJtae+eaTn4TiZqPT7K+C7A= -sigs.k8s.io/kustomize/kyaml v0.3.4/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw= +sigs.k8s.io/kustomize/api v0.5.1 h1:iHGTs5LcnJGqHstUSxWD/kX6XZgmd82x79LLlZwDU0I= +sigs.k8s.io/kustomize/api v0.5.1/go.mod h1:LGqJ9ZWOnWDqlECqrFgNUyEqSJc6ooA9ZiWZ4KFZv+I= +sigs.k8s.io/kustomize/kyaml v0.4.1 h1:NEqA/35upoAjb+I5vh1ODUqxoX4DOrezeQa9BhhG5Co= +sigs.k8s.io/kustomize/kyaml v0.4.1/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= diff --git a/manifests/bases/helm-controller/kustomization.yaml b/manifests/bases/helm-controller/kustomization.yaml index 9e0f332b..6af2eb79 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: -- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.1-alpha.1 -- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.1-alpha.1 +- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.1-alpha.2 +- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.1-alpha.2 patchesJson6902: - target: group: apps diff --git a/manifests/bases/kustomize-controller/kustomization.yaml b/manifests/bases/kustomize-controller/kustomization.yaml index aae438f2..3667c2b6 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: -- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.2 -- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.2 +- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.4 +- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.4 patchesJson6902: - target: group: apps diff --git a/manifests/bases/notification-controller/kustomization.yaml b/manifests/bases/notification-controller/kustomization.yaml index 96471bdc..6c6e7396 100644 --- a/manifests/bases/notification-controller/kustomization.yaml +++ b/manifests/bases/notification-controller/kustomization.yaml @@ -1,5 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.3 -- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.3 +- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.4 +- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.4 diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml index 7b08a342..bb900392 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: -- github.com/fluxcd/source-controller/config//crd?ref=v0.0.2 -- github.com/fluxcd/source-controller/config//manager?ref=v0.0.2 +- github.com/fluxcd/source-controller/config//crd?ref=v0.0.5 +- github.com/fluxcd/source-controller/config//manager?ref=v0.0.5 patchesJson6902: - target: group: apps