feat: update install config generation

* Generate managed services config by default
* Do not marshal empty issuer type
* Minor update: help output of --skip-steps

Author: NautiluX

cli/cmd/install_codesphere.go

@@ -68,7 +68,7 @@ func AddInstallCodesphereCmd(install *cobra.Command, opts *GlobalOptions) {
 	codesphere.cmd.Flags().BoolVarP(&codesphere.Opts.Force, "force", "f", false, "Enforce package extraction")
 	codesphere.cmd.Flags().StringVarP(&codesphere.Opts.Config, "config", "c", "", "Path to the Codesphere Private Cloud configuration file (yaml)")
 	codesphere.cmd.Flags().StringVarP(&codesphere.Opts.PrivKey, "priv-key", "k", "", "Path to the private key to encrypt/decrypt secrets")
-	codesphere.cmd.Flags().StringSliceVarP(&codesphere.Opts.SkipSteps, "skip-steps", "s", []string{}, "Steps to be skipped. Must be one of: copy-dependencies, extract-dependencies, load-container-images, ceph, kubernetes")
+	codesphere.cmd.Flags().StringSliceVarP(&codesphere.Opts.SkipSteps, "skip-steps", "s", []string{}, "Steps to be skipped. E.g. copy-dependencies, extract-dependencies, load-container-images, ceph, kubernetes")
 
 	util.MarkFlagRequired(codesphere.cmd, "package")
 	util.MarkFlagRequired(codesphere.cmd, "config")

internal/bootstrap/gcp/gcp.go

@@ -1308,21 +1308,6 @@ func (b *GCPBootstrapper) UpdateInstallConfig() error {
 		}
 	}
 
-	b.Env.InstallConfig.Codesphere.ManagedServices = []files.ManagedServiceConfig{
-		{
-			Name:    "postgres",
-			Version: "v1",
-		},
-		{
-			Name:    "babelfish",
-			Version: "v1",
-		},
-		{
-			Name:    "s3",
-			Version: "v1",
-		},
-	}
-
 	if b.Env.OpenBaoURI != "" {
 		b.Env.InstallConfig.Codesphere.OpenBao = &files.OpenBaoConfig{
 			Engine:   b.Env.OpenBaoEngine,

internal/bootstrap/gcp/gcp_test.go

@@ -1188,7 +1188,6 @@ var _ = Describe("GCP Bootstrapper", func() {
 				Expect(cloudDns["project"]).To(Equal(bs.Env.DNSProjectID))
 
 				Expect(bs.Env.InstallConfig.Codesphere.OpenBao).To(BeNil())
-				Expect(len(bs.Env.InstallConfig.Codesphere.ManagedServices)).To(Equal(3))
 			})
 			Context("When Experiments are set in CodesphereEnvironment", func() {
 				BeforeEach(func() {

internal/installer/config_manager_profile.go

@@ -103,6 +103,20 @@ func (g *InstallConfig) ApplyProfile(profile string) error {
 	g.Config.ManagedServiceBackends = &files.ManagedServiceBackendsConfig{
 		Postgres: make(map[string]interface{}),
 	}
+	g.Config.Codesphere.ManagedServices = []files.ManagedServiceConfig{
+		{
+			Name:    "postgres",
+			Version: "v1",
+		},
+		{
+			Name:    "babelfish",
+			Version: "v1",
+		},
+		{
+			Name:    "s3",
+			Version: "v1",
+		},
+	}
 	g.Config.Secrets.BaseDir = "/root/secrets"
 
 	switch profile {

internal/installer/config_manager_profile_test.go

@@ -223,6 +223,10 @@ var _ = Describe("ConfigManagerProfile", func() {
 					Expect(config.ManagedServiceBackends).ToNot(BeNil())
 					Expect(config.ManagedServiceBackends.Postgres).ToNot(BeNil())
 
+					// Managed service config
+					Expect(config.Codesphere.ManagedServices).ToNot(BeNil())
+					Expect(len(config.Codesphere.ManagedServices)).To(Equal(3))
+
 					// Secrets
 					Expect(config.Secrets.BaseDir).To(Equal("/root/secrets"))
 				})

internal/installer/files/config_yaml.go

@@ -285,7 +285,7 @@ const (
 )
 
 type CertIssuerConfig struct {
-	Type CertIssuerType `yaml:"type"`
+	Type CertIssuerType `yaml:"type,omitempty"`
 	Acme *ACMEConfig    `yaml:"acme,omitempty"`
 }