Skip to content

feat: update install config generation #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NautiluX wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: update install config generation #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70804c5
feat: update install config generation
NautiluX Feb 27, 2026
b81deda
chore(docs): Auto-update docs and licenses
NautiluX Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ License URL: https://github.com/googleapis/google-cloud-go/blob/auth/oauth2adapt

----------
Module: cloud.google.com/go/compute
Version: v1.54.0
Version: v1.55.0
License: Apache-2.0
License URL: https://github.com/googleapis/google-cloud-go/blob/compute/v1.54.0/compute/LICENSE
License URL: https://github.com/googleapis/google-cloud-go/blob/compute/v1.55.0/compute/LICENSE

----------
Module: cloud.google.com/go/compute/metadata
Expand Down Expand Up @@ -95,9 +95,9 @@ License URL: https://github.com/clipperhouse/uax29/blob/v2.4.0/LICENSE

----------
Module: github.com/codesphere-cloud/cs-go
Version: v0.17.2
Version: v0.19.1
License: Apache-2.0
License URL: https://github.com/codesphere-cloud/cs-go/blob/v0.17.2/LICENSE
License URL: https://github.com/codesphere-cloud/cs-go/blob/v0.19.1/LICENSE

----------
Module: github.com/codesphere-cloud/oms/internal/tmpl
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/install_codesphere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion docs/oms-cli_install_codesphere.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ oms-cli install codesphere [flags]
-h, --help help for codesphere
-p, --package string Package file (e.g. codesphere-v1.2.3-installer.tar.gz) to load binaries, installer etc. from
-k, --priv-key string Path to the private key to encrypt/decrypt secrets
-s, --skip-steps strings Steps to be skipped. Must be one of: copy-dependencies, extract-dependencies, load-container-images, ceph, kubernetes
-s, --skip-steps strings Steps to be skipped. E.g. copy-dependencies, extract-dependencies, load-container-images, ceph, kubernetes
```

### SEE ALSO
Expand Down
15 changes: 0 additions & 15 deletions internal/bootstrap/gcp/gcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion internal/bootstrap/gcp/gcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
14 changes: 14 additions & 0 deletions internal/installer/config_manager_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions internal/installer/config_manager_profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
})
Expand Down
2 changes: 1 addition & 1 deletion internal/installer/files/config_yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ const (
)

type CertIssuerConfig struct {
Type CertIssuerType `yaml:"type"`
Type CertIssuerType `yaml:"type,omitempty"`
Acme *ACMEConfig `yaml:"acme,omitempty"`
}

Expand Down
8 changes: 4 additions & 4 deletions internal/tmpl/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ License URL: https://github.com/googleapis/google-cloud-go/blob/auth/oauth2adapt

----------
Module: cloud.google.com/go/compute
Version: v1.54.0
Version: v1.55.0
License: Apache-2.0
License URL: https://github.com/googleapis/google-cloud-go/blob/compute/v1.54.0/compute/LICENSE
License URL: https://github.com/googleapis/google-cloud-go/blob/compute/v1.55.0/compute/LICENSE

----------
Module: cloud.google.com/go/compute/metadata
Expand Down Expand Up @@ -95,9 +95,9 @@ License URL: https://github.com/clipperhouse/uax29/blob/v2.4.0/LICENSE

----------
Module: github.com/codesphere-cloud/cs-go
Version: v0.17.2
Version: v0.19.1
License: Apache-2.0
License URL: https://github.com/codesphere-cloud/cs-go/blob/v0.17.2/LICENSE
License URL: https://github.com/codesphere-cloud/cs-go/blob/v0.19.1/LICENSE

----------
Module: github.com/codesphere-cloud/oms/internal/tmpl
Expand Down