- args = fmt.Sprintf("%s --namespace=%s", args, x.Namespace)
- if x.HelmVersion != "" {
- args = fmt.Sprintf("%s --version=%s", args, x.HelmVersion)
- }
-
- if x.ReleaseName != "" {
- args = fmt.Sprintf("%s --name=%s", args, x.ReleaseName)
- } else {
- args = fmt.Sprintf("%s --name=%s", args, *x.XappName)
- }
-
- if cmOverride == true {
- args = fmt.Sprintf("%s ---set ricapp.appconfig.override=%s-appconfig", args, *x.XappName)
- }
-
- if x.OverrideFile != nil {
- if overrideYaml, err := yaml.JSONToYAML([]byte(x.OverrideFile.(string))); err == nil {
- err = ioutil.WriteFile("/tmp/appmgr_override.yaml", overrideYaml, 0644)
- if err != nil {
- appmgr.Logger.Info("ioutil.WriteFile(/tmp/appmgr_override.yaml) failed: %v", err)
- } else {
- args = args + " -f=/tmp/appmgr_override.yaml"
- }
- } else {
- appmgr.Logger.Info("yaml.JSONToYAML failed: %v", err)
- }
- }
-
- repoName := viper.GetString("helm.repo-name")
- if repoName == "" {
- repoName = "helm-repo"
- }
- return fmt.Sprintf("install %s/%s %s", repoName, *x.XappName, args)
+ args = fmt.Sprintf("%s--namespace=%s", args, x.Namespace)
+ if x.HelmVersion != "" {
+ args = fmt.Sprintf("%s --version=%s", args, x.HelmVersion)
+ }
+
+ if cm.EnvHelmVersion == cm.HELM_VERSION_2 {
+ if x.ReleaseName != "" {
+ args = fmt.Sprintf("%s --name=%s", args, x.ReleaseName)
+ } else {
+ args = fmt.Sprintf("%s --name=%s", args, *x.XappName)
+ appmgr.Logger.Info("")
+ }
+ appmgr.Logger.Info ("GetInstallArgs: Version 2")
+ }
+
+ if cmOverride == true {
+ args = fmt.Sprintf("%s --set ricapp.appconfig.override=%s-appconfig", args, *x.XappName)
+ }
+
+ if x.OverrideFile != nil {
+ if overrideYaml, err := yaml.JSONToYAML([]byte(x.OverrideFile.(string))); err == nil {
+ err = ioutil.WriteFile("/tmp/appmgr_override.yaml", overrideYaml, 0644)
+ if err != nil {
+ appmgr.Logger.Info("ioutil.WriteFile(/tmp/appmgr_override.yaml) failed: %v", err)
+ } else {
+ args = args + " -f=/tmp/appmgr_override.yaml"
+ }
+ } else {
+ appmgr.Logger.Info("yaml.JSONToYAML failed: %v", err)
+ }
+ }
+
+ repoName := viper.GetString("helm.repo-name")
+ if repoName == "" {
+ repoName = "helm-repo"
+ }
+
+ if cm.EnvHelmVersion == cm.HELM_VERSION_3 {
+ appmgr.Logger.Info ("GetInstallArgs last: Version 3")
+ return fmt.Sprintf("install %s %s/%s %s",*x.XappName, repoName, *x.XappName, args)
+ } else {
+ appmgr.Logger.Info ("GetInstallArgs last: Version 2")
+ return fmt.Sprintf("install %s/%s %s", repoName, *x.XappName, args)
+ }