@@ -2,31 +2,36 @@ package nelm
22
33import (
44 "context"
5+ "errors"
56 "fmt"
67 "log/slog"
78 "os"
8- "regexp "
9+ "sort "
910 "strconv"
1011 "time"
1112
13+ "github.com/gookit/color"
1214 "helm.sh/helm/v3/pkg/cli"
1315 "k8s.io/cli-runtime/pkg/genericclioptions"
1416 "k8s.io/client-go/rest"
17+ "sigs.k8s.io/yaml"
1518
1619 "github.com/flant/addon-operator/pkg/helm/client"
1720 "github.com/flant/addon-operator/pkg/utils"
1821
1922 "github.com/werf/nelm/pkg/action"
23+ "github.com/werf/nelm/pkg/log"
2024)
2125
22- // FIXME(nelm): get rid of all globals in Nelm to be able to run them sequentially or in parallel
23-
2426var (
2527 _ client.HelmClient = & NelmClient {}
2628 commonOptions * CommonOptions
2729)
2830
2931func Init (opts * CommonOptions , logger * NelmLogger ) error {
32+ log .Default = logger
33+ color .Disable ()
34+
3035 getter := buildConfigFlagsFromEnv (& commonOptions .Namespace , cli .New ())
3136
3237 // FIXME(addon-operator): add all other options from getter in the same manner
@@ -38,10 +43,6 @@ func Init(opts *CommonOptions, logger *NelmLogger) error {
3843 opts .HelmDriver = os .Getenv ("HELM_DRIVER" )
3944 }
4045
41- // FIXME(nelm): this function does A LOT. And with what addon-operator expects from us
42- // in regards to logging, all of this is kind of a mess now
43- action .SetupLogging (context .TODO (), "info" , "" , "off" )
44-
4546 commonOptions = opts
4647
4748 versionResult , err := action .Version (context .TODO (), action.VersionOptions {
@@ -57,9 +58,8 @@ func Init(opts *CommonOptions, logger *NelmLogger) error {
5758}
5859
5960type CommonOptions struct {
60- Namespace string
61- HistoryMax int32
62- // FIXME(nelm): add global timeout to Nelm actions
61+ Namespace string
62+ HistoryMax int32
6363 Timeout time.Duration
6464 HelmDriver string
6565 KubeContext string
@@ -95,8 +95,8 @@ func (c *NelmClient) LastReleaseStatus(releaseName string) (string, string, erro
9595 ReleaseStorageDriver : commonOptions .HelmDriver ,
9696 })
9797 if err != nil {
98- // FIXME(nelm): return a specific error from ReleaseGet if release not found
99- if regexp . MustCompile ( `.+release ".+" (namespace ".+") not found` ). Match ([] byte ( err . Error ()) ) {
98+ var releaseNotFoundErr * action. ReleaseNotFoundError
99+ if errors . As ( err , & releaseNotFoundErr ) {
100100 return "0" , "" , fmt .Errorf ("get nelm release %q: %w" , releaseName , err )
101101 }
102102
@@ -112,15 +112,15 @@ func (c *NelmClient) UpgradeRelease(releaseName string, chartName string, values
112112 slog .String ("chart" , chartName ),
113113 slog .String ("namespace" , namespace ))
114114
115- // FIXME(nelm): deploy without installing CRDs
116- // FIXME(nelm): allow passing labels to Release.Labels
117115 if err := action .ReleaseInstall (context .TODO (), releaseName , namespace , action.ReleaseInstallOptions {
118- // FIXME(nelm): allow passing remote chart path
119- ChartDirPath : chartName ,
116+ Chart : chartName ,
120117 ExtraLabels : c .labels ,
121118 KubeContext : commonOptions .KubeContext ,
119+ NoInstallCRDs : true ,
122120 ReleaseHistoryLimit : int (commonOptions .HistoryMax ),
121+ ReleaseLabels : labels ,
123122 ReleaseStorageDriver : commonOptions .HelmDriver ,
123+ Timeout : commonOptions .Timeout ,
124124 ValuesFilesPaths : valuesPaths ,
125125 ValuesSets : setValues ,
126126 }); err != nil {
@@ -153,12 +153,11 @@ func (c *NelmClient) GetReleaseChecksum(releaseName string) (string, error) {
153153 return checksum , nil
154154 }
155155
156- // FIXME(nelm): expose Values in ReleaseGetResult and uncomment this
157- // if recordedChecksum, hasKey := releaseGetResult.Values["_addonOperatorModuleChecksum"]; hasKey {
158- // if recordedChecksumStr, ok := recordedChecksum.(string); ok {
159- // return recordedChecksumStr, nil
160- // }
161- // }
156+ if recordedChecksum , hasKey := releaseGetResult .Values ["_addonOperatorModuleChecksum" ]; hasKey {
157+ if recordedChecksumStr , ok := recordedChecksum .(string ); ok {
158+ return recordedChecksumStr , nil
159+ }
160+ }
162161
163162 return "" , fmt .Errorf ("moduleChecksum label not found in nelm release %q" , releaseName )
164163}
@@ -167,6 +166,7 @@ func (c *NelmClient) DeleteRelease(releaseName string) error {
167166 c .logger .Debug (context .TODO (), "nelm release: execute nelm uninstall" , slog .String ("release" , releaseName ))
168167
169168 if err := action .ReleaseUninstall (context .TODO (), releaseName , commonOptions .Namespace , action.ReleaseUninstallOptions {
169+ Timeout : commonOptions .Timeout ,
170170 KubeContext : commonOptions .KubeContext ,
171171 ReleaseHistoryLimit : int (commonOptions .HistoryMax ),
172172 ReleaseStorageDriver : commonOptions .HelmDriver ,
@@ -193,21 +193,37 @@ func (c *NelmClient) IsReleaseExists(releaseName string) (bool, error) {
193193}
194194
195195func (c * NelmClient ) ListReleasesNames () ([]string , error ) {
196- // FIXME(nelm): implement ReleaseList as a Nelm action
197- panic ("not implemented yet" )
196+ releaseListResult , err := action .ReleaseList (context .TODO (), action.ReleaseListOptions {
197+ KubeContext : commonOptions .KubeContext ,
198+ OutputNoPrint : true ,
199+ ReleaseStorageDriver : commonOptions .HelmDriver ,
200+ })
201+ if err != nil {
202+ return nil , fmt .Errorf ("list nelm releases: %w" , err )
203+ }
204+
205+ var releaseNames []string
206+ for _ , release := range releaseListResult .Releases {
207+ // FIXME(addon-operator): not sure how this can happen, it is impossible to deploy a release with no name with Nelm, and, I believe, with Helm too
208+ if release .Name == "" {
209+ continue
210+ }
211+
212+ releaseNames = append (releaseNames , release .Name )
213+ }
214+
215+ sort .Strings (releaseNames )
216+
217+ return releaseNames , nil
198218}
199219
200220func (c * NelmClient ) Render (releaseName , chartName string , valuesPaths , setValues []string , namespace string , debug bool ) (string , error ) {
201- // FIXME(nelm): debug arg is not used now. Nelm doesn't return bad manifests on error, instead it has very verbose trace log level which prints them. Do we really need to dump bad manifests on error?
202-
203221 c .logger .Debug (context .TODO (), "Render nelm templates for chart ..." ,
204222 slog .String ("chart" , chartName ),
205223 slog .String ("namespace" , namespace ))
206224
207- // FIXME(nelm): need to return ChartRenderResultV1, like we did in action.ChartRender
208- err := action .ChartRender (context .TODO (), action.ChartRenderOptions {
209- // FIXME(nelm): allow passing remote chart path
210- ChartDirPath : chartName ,
225+ chartRenderResult , err := action .ChartRender (context .TODO (), action.ChartRenderOptions {
226+ Chart : chartName ,
211227 ExtraLabels : c .labels ,
212228 KubeContext : commonOptions .KubeContext ,
213229 Remote : true ,
@@ -223,8 +239,21 @@ func (c *NelmClient) Render(releaseName, chartName string, valuesPaths, setValue
223239
224240 c .logger .Info (context .TODO (), "Render nelm templates for chart was successful" , slog .String ("chart" , chartName ))
225241
226- // FIXME(nelm): we should return manifests from ChartRenderResultV1
227- panic ("not implemented yet" )
242+ var result string
243+ for _ , resource := range chartRenderResult .Resources {
244+ b , err := yaml .Marshal (resource )
245+ if err != nil {
246+ return "" , fmt .Errorf ("marshal resource: %w" , err )
247+ }
248+
249+ if result != "" {
250+ result += "---\n "
251+ }
252+
253+ result += string (b )
254+ }
255+
256+ return result , nil
228257}
229258
230259func buildConfigFlagsFromEnv (ns * string , env * cli.EnvSettings ) * genericclioptions.ConfigFlags {
0 commit comments