From fa56685767a71ddb48a126986eb741be93a5374e Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 2 Sep 2020 19:28:39 +0200 Subject: [PATCH 1/2] Upgrade Toolkit components and K8S deps * github.com/fluxcd/helm-controller/api to v0.0.6 * github.com/fluxcd/source-controller/api to v0.0.13 * k8s.io/api to v0.18.8 * k8s.io/apiextensions-apiserver to v0.18.8 * k8s.io/apimachinery to v0.18.8 * k8s.io/client-go to v0.18.8 * sigs.k8s.io/controller-runtime to v0.6.2 --- cmd/gotk/create_helmrelease.go | 12 ++++---- cmd/gotk/reconcile_helmrelease.go | 2 +- go.mod | 14 ++++----- go.sum | 29 ++++++++++++++++--- .../bases/helm-controller/kustomization.yaml | 4 +-- .../source-controller/kustomization.yaml | 4 +-- 6 files changed, 44 insertions(+), 21 deletions(-) diff --git a/cmd/gotk/create_helmrelease.go b/cmd/gotk/create_helmrelease.go index 687e8f41d1..cff99edd8a 100644 --- a/cmd/gotk/create_helmrelease.go +++ b/cmd/gotk/create_helmrelease.go @@ -132,11 +132,13 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error { }, TargetNamespace: hrTargetNamespace, Chart: helmv2.HelmChartTemplate{ - Name: hrChartName, - Version: hrChartVersion, - SourceRef: helmv2.CrossNamespaceObjectReference{ - Kind: sourcev1.HelmRepositoryKind, - Name: hrSource, + Spec: helmv2.HelmChartTemplateSpec{ + Chart: hrChartName, + Version: hrChartVersion, + SourceRef: helmv2.CrossNamespaceObjectReference{ + Kind: sourcev1.HelmRepositoryKind, + Name: hrSource, + }, }, }, Suspend: false, diff --git a/cmd/gotk/reconcile_helmrelease.go b/cmd/gotk/reconcile_helmrelease.go index 9bbab9945c..f45cbdb772 100644 --- a/cmd/gotk/reconcile_helmrelease.go +++ b/cmd/gotk/reconcile_helmrelease.go @@ -81,7 +81,7 @@ func reconcileHrCmdRun(cmd *cobra.Command, args []string) error { } if syncHrWithSource { - err := syncSourceHelmCmdRun(nil, []string{helmRelease.Spec.Chart.SourceRef.Name}) + err := syncSourceHelmCmdRun(nil, []string{helmRelease.Spec.Chart.Spec.SourceRef.Name}) if err != nil { return err } diff --git a/go.mod b/go.mod index b6d9fee164..af886f1462 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,12 @@ go 1.14 require ( github.com/blang/semver v3.5.1+incompatible - github.com/fluxcd/helm-controller/api v0.0.5 + github.com/fluxcd/helm-controller/api v0.0.6 github.com/fluxcd/kustomize-controller/api v0.0.8 github.com/fluxcd/pkg/git v0.0.6 github.com/fluxcd/pkg/ssh v0.0.5 github.com/fluxcd/pkg/untar v0.0.5 - github.com/fluxcd/source-controller/api v0.0.10 + github.com/fluxcd/source-controller/api v0.0.13 github.com/manifoldco/promptui v0.7.0 github.com/spf13/cobra v1.0.0 golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect @@ -17,11 +17,11 @@ require ( golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect google.golang.org/appengine v1.6.6 // indirect google.golang.org/protobuf v1.24.0 // indirect - k8s.io/api v0.18.4 - k8s.io/apiextensions-apiserver v0.18.4 - k8s.io/apimachinery v0.18.4 - k8s.io/client-go v0.18.4 - sigs.k8s.io/controller-runtime v0.6.1 + k8s.io/api v0.18.8 + k8s.io/apiextensions-apiserver v0.18.8 + k8s.io/apimachinery v0.18.8 + k8s.io/client-go v0.18.8 + sigs.k8s.io/controller-runtime v0.6.2 sigs.k8s.io/kustomize/api v0.5.1 sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 5364cf38ee..fd9b36acb0 100644 --- a/go.sum +++ b/go.sum @@ -106,12 +106,13 @@ github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/helm-controller/api v0.0.5 h1:rB4IycwXjeN6h3te7WFW5XDJ0oP59fV+RiM6/TJucjM= -github.com/fluxcd/helm-controller/api v0.0.5/go.mod h1:YCQhNz7LkYyBGxDdMGSRK78nvhuHV2x/lrn2vuRlBNE= +github.com/fluxcd/helm-controller/api v0.0.6 h1:EpP1/cYClFrZqaw4B2mZ/qxTSDmvxJxj+VYZZR1XaTI= +github.com/fluxcd/helm-controller/api v0.0.6/go.mod h1:KlzwTkpphQxulgWBwCl/uxfBU0QxK/X+w4YcJqGy/1c= github.com/fluxcd/kustomize-controller/api v0.0.8 h1:Yi5/MZuS2jXiRV73fuUkBCyRTuG0yx2HJTpWZaM+WHA= github.com/fluxcd/kustomize-controller/api v0.0.8/go.mod h1:c4035rZrt2p3RExpLe64ASVEvePm7FjiY4PzHKpRJXI= github.com/fluxcd/pkg/git v0.0.6 h1:4qktw8M3zj98MAs4ny6qSi36sYvTiI1czif5FqlQl4o= @@ -120,8 +121,8 @@ github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A= github.com/fluxcd/pkg/ssh v0.0.5/go.mod h1:7jXPdXZpc0ttMNz2kD9QuMi3RNn/e0DOFbj0Tij/+Hs= github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk= github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw= -github.com/fluxcd/source-controller/api v0.0.10 h1:j4ldVKx/ACq5eP98at71DzD9wSNqCE2018skIdkaamE= -github.com/fluxcd/source-controller/api v0.0.10/go.mod h1:Q0bjU4/O1C4FoQT/O2YgGtJnoRWtrw4R/MowywCaDNg= +github.com/fluxcd/source-controller/api v0.0.13 h1:rf0uZ20OAN+yJVs0uHJUhw3n3ci9ZyjaLqt5Jt/5K9A= +github.com/fluxcd/source-controller/api v0.0.13/go.mod h1:PUe+EYQ/s+KPnz2iOCgdf+L6clM0SWkyvdXIpbfpkQE= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -727,17 +728,35 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= k8s.io/api v0.18.4 h1:8x49nBRxuXGUlDlwlWd3RMY1SayZrzFfxea3UZSkFw4= k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= +k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= +k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4= +k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= k8s.io/apiextensions-apiserver v0.18.4 h1:Y3HGERmS8t9u12YNUFoOISqefaoGRuTc43AYCLzWmWE= k8s.io/apiextensions-apiserver v0.18.4/go.mod h1:NYeyeYq4SIpFlPxSAB6jHPIdvu3hL0pc36wuRChybio= +k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= +k8s.io/apiextensions-apiserver v0.18.8 h1:pkqYPKTHa0/3lYwH7201RpF9eFm0lmZDFBNzhN+k/sA= +k8s.io/apiextensions-apiserver v0.18.8/go.mod h1:7f4ySEkkvifIr4+BRrRWriKKIJjPyg9mb/p63dJKnlM= k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.18.4 h1:ST2beySjhqwJoIFk6p7Hp5v5O0hYY6Gngq/gUYXTPIA= k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= +k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= +k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0= +k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= k8s.io/apiserver v0.18.4/go.mod h1:q+zoFct5ABNnYkGIaGQ3bcbUNdmPyOCoEBcg51LChY8= +k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= +k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM= k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k= k8s.io/client-go v0.18.4 h1:un55V1Q/B3JO3A76eS0kUSywgGK/WR3BQ8fHQjNa6Zc= k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g= +k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= +k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM= +k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= k8s.io/code-generator v0.18.4/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= +k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= +k8s.io/code-generator v0.18.8/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/component-base v0.18.4/go.mod h1:7jr/Ef5PGmKwQhyAz/pjByxJbC58mhKAhiaDu0vXfPk= +k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= +k8s.io/component-base v0.18.8/go.mod h1:00frPRDas29rx58pPCxNkhUfPbwajlyyvu8ruNgSErU= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -759,6 +778,8 @@ mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZI sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= sigs.k8s.io/controller-runtime v0.6.1 h1:LcK2+nk0kmaOnKGN+vBcWHqY5WDJNJNB/c5pW+sU8fc= sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gEORz0efEja7A= +sigs.k8s.io/controller-runtime v0.6.2 h1:jkAnfdTYBpFwlmBn3pS5HFO06SfxvnTZ1p5PeEF/zAA= +sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E= 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= diff --git a/manifests/bases/helm-controller/kustomization.yaml b/manifests/bases/helm-controller/kustomization.yaml index 6918248944..55a8e7326f 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.5 -- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.5 +- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.6 +- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.6 patchesJson6902: - target: group: apps diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml index 6bf7d622ad..956bb63a5a 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.10 -- github.com/fluxcd/source-controller/config//manager?ref=v0.0.10 +- github.com/fluxcd/source-controller/config//crd?ref=v0.0.13 +- github.com/fluxcd/source-controller/config//manager?ref=v0.0.13 patchesJson6902: - target: group: apps From e53d0dadbfd20af7cfd79f1d3a9bc4422da67a21 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 2 Sep 2020 20:00:31 +0200 Subject: [PATCH 2/2] Support GitRepository source in HelmRelease cmds --- .github/workflows/e2e.yaml | 27 ++++++++++------ cmd/gotk/create_helmrelease.go | 50 ++++++++++++++++++----------- cmd/gotk/reconcile_helmrelease.go | 8 ++++- docs/cmd/gotk_create_helmrelease.md | 28 ++++++++++------ 4 files changed, 75 insertions(+), 38 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 06cbff5502..cb100bd5da 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -88,32 +88,41 @@ jobs: - name: gotk delete kustomization run: | ./bin/gotk delete kustomization podinfo --silent - - name: gotk delete source git - run: | - ./bin/gotk delete source git podinfo --silent - name: gotk create source helm run: | ./bin/gotk create source helm podinfo \ --url https://stefanprodan.github.io/podinfo - - name: gotk create helmrelease + - name: gotk create helmrelease --source=HelmRepository/podinfo run: | - ./bin/gotk create hr podinfo \ + ./bin/gotk create hr podinfo-helm \ --target-namespace=default \ - --source=podinfo \ - --chart-name=podinfo \ + --source=HelmRepository/podinfo \ + --chart=podinfo \ --chart-version=">4.0.0 <5.0.0" + - name: gotk create helmrelease --source=GitRepository/podinfo + run: | + ./bin/gotk create hr podinfo-git \ + --target-namespace=default \ + --source=GitRepository/podinfo \ + --chart=./charts/podinfo - name: gotk get helmreleases run: | ./bin/gotk get helmreleases - name: gotk export helmrelease run: | ./bin/gotk export hr --all - - name: gotk delete helmrelease + - name: gotk delete helmrelease podinfo-helm + run: | + ./bin/gotk delete hr podinfo-helm --silent + - name: gotk delete helmrelease podinfo-git run: | - ./bin/gotk delete hr podinfo --silent + ./bin/gotk delete hr podinfo-git --silent - name: gotk delete source helm run: | ./bin/gotk delete source helm podinfo --silent + - name: gotk delete source git + run: | + ./bin/gotk delete source git podinfo --silent - name: gotk check run: | ./bin/gotk check diff --git a/cmd/gotk/create_helmrelease.go b/cmd/gotk/create_helmrelease.go index cff99edd8a..c172079ea6 100644 --- a/cmd/gotk/create_helmrelease.go +++ b/cmd/gotk/create_helmrelease.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "io/ioutil" + "strings" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" @@ -41,28 +42,36 @@ var createHelmReleaseCmd = &cobra.Command{ Aliases: []string{"hr"}, Short: "Create or update a HelmRelease resource", Long: "The helmrelease create command generates a HelmRelease resource for a given HelmRepository source.", - Example: ` # Create a HelmRelease from a source + Example: ` # Create a HelmRelease from a HelmRepository source gotk create hr podinfo \ --interval=10m \ --release-name=podinfo \ --target-namespace=default \ - --source=podinfo \ - --chart-name=podinfo \ + --source=HelmRepository/podinfo \ + --chart=podinfo \ --chart-version=">4.0.0" + # Create a HelmRelease from a GitRepository source + gotk create hr podinfo \ + --interval=10m \ + --release-name=podinfo \ + --target-namespace=default \ + --source=GitRepository/podinfo \ + --chart=./charts/podinfo + # Create a HelmRelease with values for a local YAML file gotk create hr podinfo \ --target-namespace=default \ - --source=podinfo \ - --chart-name=podinfo \ + --source=HelmRepository/podinfo \ + --chart=podinfo \ --chart-version=4.0.5 \ --values=./my-values.yaml # Create a HelmRelease definition on disk without applying it on the cluster gotk create hr podinfo \ --target-namespace=default \ - --source=podinfo \ - --chart-name=podinfo \ + --source=HelmRepository/podinfo \ + --chart=podinfo \ --chart-version=4.0.5 \ --values=./values.yaml \ --export > podinfo-release.yaml @@ -74,7 +83,7 @@ var ( hrName string hrSource string hrDependsOn []string - hrChartName string + hrChart string hrChartVersion string hrTargetNamespace string hrValuesFile string @@ -82,9 +91,9 @@ var ( func init() { createHelmReleaseCmd.Flags().StringVar(&hrName, "release-name", "", "name used for the Helm release, defaults to a composition of '-'") - createHelmReleaseCmd.Flags().StringVar(&hrSource, "source", "", "HelmRepository name") - createHelmReleaseCmd.Flags().StringVar(&hrChartName, "chart-name", "", "Helm chart name") - createHelmReleaseCmd.Flags().StringVar(&hrChartVersion, "chart-version", "", "Helm chart version, accepts semver range") + createHelmReleaseCmd.Flags().StringVar(&hrSource, "source", "", "source that contains the chart (/)") + createHelmReleaseCmd.Flags().StringVar(&hrChart, "chart", "", "Helm chart name or path") + createHelmReleaseCmd.Flags().StringVar(&hrChartVersion, "chart-version", "", "Helm chart version, accepts semver range (ignored for charts from GitRepository sources)") createHelmReleaseCmd.Flags().StringArrayVar(&hrDependsOn, "depends-on", nil, "HelmReleases that must be ready before this release can be installed") createHelmReleaseCmd.Flags().StringVar(&hrTargetNamespace, "target-namespace", "", "namespace to install this release, defaults to the HelmRelease namespace") createHelmReleaseCmd.Flags().StringVar(&hrValuesFile, "values", "", "local path to the values.yaml file") @@ -100,11 +109,16 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error { if hrSource == "" { return fmt.Errorf("source is required") } - if hrChartName == "" { - return fmt.Errorf("chart name is required") + hrSourceElements := strings.Split(hrSource, "/") + if len(hrSourceElements) != 2 { + return fmt.Errorf("source must be in format /") + } + hrSourceKind, hrSourceName := hrSourceElements[0], hrSourceElements[1] + if hrSourceKind != sourcev1.HelmRepositoryKind && hrSourceKind != sourcev1.GitRepositoryKind { + return fmt.Errorf("source kind must be one of: %s", []string{sourcev1.HelmRepositoryKind, sourcev1.GitRepositoryKind}) } - if hrChartVersion == "" { - return fmt.Errorf("chart version is required") + if hrChart == "" { + return fmt.Errorf("chart name or path is required") } ctx, cancel := context.WithTimeout(context.Background(), timeout) @@ -133,11 +147,11 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error { TargetNamespace: hrTargetNamespace, Chart: helmv2.HelmChartTemplate{ Spec: helmv2.HelmChartTemplateSpec{ - Chart: hrChartName, + Chart: hrChart, Version: hrChartVersion, SourceRef: helmv2.CrossNamespaceObjectReference{ - Kind: sourcev1.HelmRepositoryKind, - Name: hrSource, + Kind: hrSourceKind, + Name: hrSourceName, }, }, }, diff --git a/cmd/gotk/reconcile_helmrelease.go b/cmd/gotk/reconcile_helmrelease.go index f45cbdb772..7d733eb044 100644 --- a/cmd/gotk/reconcile_helmrelease.go +++ b/cmd/gotk/reconcile_helmrelease.go @@ -21,6 +21,7 @@ import ( "fmt" "time" + sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" @@ -81,7 +82,12 @@ func reconcileHrCmdRun(cmd *cobra.Command, args []string) error { } if syncHrWithSource { - err := syncSourceHelmCmdRun(nil, []string{helmRelease.Spec.Chart.Spec.SourceRef.Name}) + switch helmRelease.Spec.Chart.Spec.SourceRef.Kind { + case sourcev1.HelmRepositoryKind: + err = syncSourceHelmCmdRun(nil, []string{helmRelease.Spec.Chart.Spec.SourceRef.Name}) + case sourcev1.GitRepositoryKind: + err = syncSourceGitCmdRun(nil, []string{helmRelease.Spec.Chart.Spec.SourceRef.Name}) + } if err != nil { return err } diff --git a/docs/cmd/gotk_create_helmrelease.md b/docs/cmd/gotk_create_helmrelease.md index a01e4bbb91..ac8d1ebe9e 100644 --- a/docs/cmd/gotk_create_helmrelease.md +++ b/docs/cmd/gotk_create_helmrelease.md @@ -13,28 +13,36 @@ gotk create helmrelease [name] [flags] ### Examples ``` - # Create a HelmRelease from a source + # Create a HelmRelease from a HelmRepository source gotk create hr podinfo \ --interval=10m \ --release-name=podinfo \ --target-namespace=default \ - --source=podinfo \ - --chart-name=podinfo \ + --source=HelmRepository/podinfo \ + --chart=podinfo \ --chart-version=">4.0.0" + # Create a HelmRelease from a GitRepository source + gotk create hr podinfo \ + --interval=10m \ + --release-name=podinfo \ + --target-namespace=default \ + --source=GitRepository/podinfo \ + --chart=./charts/podinfo + # Create a HelmRelease with values for a local YAML file gotk create hr podinfo \ --target-namespace=default \ - --source=podinfo \ - --chart-name=podinfo \ + --source=HelmRepository/podinfo \ + --chart=podinfo \ --chart-version=4.0.5 \ --values=./my-values.yaml # Create a HelmRelease definition on disk without applying it on the cluster gotk create hr podinfo \ --target-namespace=default \ - --source=podinfo \ - --chart-name=podinfo \ + --source=HelmRepository/podinfo \ + --chart=podinfo \ --chart-version=4.0.5 \ --values=./values.yaml \ --export > podinfo-release.yaml @@ -44,12 +52,12 @@ gotk create helmrelease [name] [flags] ### Options ``` - --chart-name string Helm chart name - --chart-version string Helm chart version, accepts semver range + --chart string Helm chart name or path + --chart-version string Helm chart version, accepts semver range (ignored for charts from GitRepository sources) --depends-on stringArray HelmReleases that must be ready before this release can be installed -h, --help help for helmrelease --release-name string name used for the Helm release, defaults to a composition of '-' - --source string HelmRepository name + --source string source that contains the chart (/) --target-namespace string namespace to install this release, defaults to the HelmRelease namespace --values string local path to the values.yaml file ```