Installer: Separate infrastructure and environment apps.
Have two separate application managers, one for installing apps on the
dodo infra, and nother installing on individual environments.
Change-Id: I1b24f008e30c5533c48c22ea92328bc4bb7abc54
diff --git a/core/installer/config.go b/core/installer/config.go
index 5269512..99ae358 100644
--- a/core/installer/config.go
+++ b/core/installer/config.go
@@ -12,9 +12,9 @@
To netip.Addr `json:"to"`
}
-type EnvConfig struct {
- Name string `json:"name"`
- PublicIP string `json:"publicIP"`
+type BootstrapConfig struct {
+ InfraName string `json:"name"`
+ PublicIP []net.IP `json:"publicIP"`
NamespacePrefix string `json:"namespacePrefix"`
StorageDir string `json:"storageDir"`
VolumeDefaultReplicaCount int `json:"volumeDefaultReplicaCount"`
@@ -28,27 +28,3 @@
}
type EnvCIDRs []EnvCIDR
-
-type Config struct {
- Values Values `json:"input"` // TODO(gio): rename
-}
-
-type Values struct {
- PCloudEnvName string `json:"pcloudEnvName,omitempty"`
- Id string `json:"id,omitempty"`
- ContactEmail string `json:"contactEmail,omitempty"`
- Domain string `json:"domain,omitempty"`
- PrivateDomain string `json:"privateDomain,omitempty"`
- PublicIP string `json:"publicIP,omitempty"`
- NamespacePrefix string `json:"namespacePrefix,omitempty"`
- // GandiAPIToken string `json:"gandiAPIToken,omitempty"`
- // LighthouseAuthUIIP string `json:"lighthouseAuthUIIP,omitempty"`
- // LighthouseMainIP string `json:"lighthouseMainIP,omitempty"`
- // LighthouseMainPort string `json:"lighthouseMainPort,omitempty"`
- // MXHostname string `json:"mxHostname,omitempty"`
- // MailGatewayAddress string `json:"mailGatewayAddress,omitempty"`
- // MatrixOAuth2ClientSecret string `json:"matrixOAuth2ClientSecret,omitempty"`
- // MatrixStorageSize string `json:"matrixStorageSize,omitempty"`
- // PiholeOAuth2ClientSecret string `json:"piholeOAuth2ClientSecret,omitempty"`
- // PiholeOAuth2CookieSecret string `json:"piholeOAuth2CookieSecret,omitempty"`
-}