kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-04-27 11:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

art: Rebranding (#130)

Browse Source 
See: https://github.com/c3os-io/c3os/issues/88
This commit is contained in:
Ettore Di Giacinto 2022-09-17 18:43:51 +02:00 committed by Itxaka
parent 0763c820f2
commit e25526cfc9
16 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/agent/agent.go
View File

@ -6,12 +6,12 @@ import (
"os"
"path/filepath"
events "github.com/c3os-io/c3os/sdk/bus"
events "github.com/kairos-io/kairos/sdk/bus"
"github.com/c3os-io/c3os/internal/bus"
config "github.com/c3os-io/c3os/pkg/config"
machine "github.com/c3os-io/c3os/pkg/machine"
bundles "github.com/c3os-io/c3os/sdk/bundles"
"github.com/kairos-io/kairos/internal/bus"
config "github.com/kairos-io/kairos/pkg/config"
machine "github.com/kairos-io/kairos/pkg/machine"
bundles "github.com/kairos-io/kairos/sdk/bundles"
"github.com/nxadm/tail"
)
@ -22,7 +22,7 @@ func Run(opts ...Option) error {
return err
}
os.MkdirAll("/usr/local/.c3os", 0600) //nolint:errcheck
os.MkdirAll("/usr/local/.kairos", 0600) //nolint:errcheck
// Reads config
c, err := config.Scan(config.Directories(o.Dir...))
@ -36,9 +36,9 @@ func Run(opts ...Option) error {
return nil
}
os.MkdirAll("/var/log/c3os", 0600) //nolint:errcheck
os.MkdirAll("/var/log/kairos", 0600) //nolint:errcheck
fileName := filepath.Join("/var/log/c3os", "agent-provider.log")
fileName := filepath.Join("/var/log/kairos", "agent-provider.log")
// Create if not exist
if _, err := os.Stat(fileName); err != nil {

13
internal/agent/config.go
View File

@ -3,7 +3,8 @@ package agent
import (
"io/ioutil"
"github.com/c3os-io/c3os/internal/c3os"
"github.com/kairos-io/kairos/internal/kairos"
"gopkg.in/yaml.v2"
)
@ -20,7 +21,7 @@ type Config struct {
func LoadConfig(path ...string) (*Config, error) {
if len(path) == 0 {
path = append(path, "/etc/c3os/agent.yaml", "/etc/elemental/config.yaml")
path = append(path, "/etc/kairos/agent.yaml", "/etc/elemental/config.yaml")
}
cfg := &Config{}
@ -33,28 +34,28 @@ func LoadConfig(path ...string) (*Config, error) {
}
if cfg.Branding.InteractiveInstall == "" {
f, err := ioutil.ReadFile(c3os.BrandingFile("interactive_install_text"))
f, err := ioutil.ReadFile(kairos.BrandingFile("interactive_install_text"))
if err == nil {
cfg.Branding.InteractiveInstall = string(f)
}
}
if cfg.Branding.Install == "" {
f, err := ioutil.ReadFile(c3os.BrandingFile("install_text"))
f, err := ioutil.ReadFile(kairos.BrandingFile("install_text"))
if err == nil {
cfg.Branding.Install = string(f)
}
}
if cfg.Branding.Recovery == "" {
f, err := ioutil.ReadFile(c3os.BrandingFile("recovery_text"))
f, err := ioutil.ReadFile(kairos.BrandingFile("recovery_text"))
if err == nil {
cfg.Branding.Recovery = string(f)
}
}
if cfg.Branding.Reset == "" {
f, err := ioutil.ReadFile(c3os.BrandingFile("reset_text"))
f, err := ioutil.ReadFile(kairos.BrandingFile("reset_text"))
if err == nil {
cfg.Branding.Reset = string(f)
}

4
internal/agent/hooks/gruboptions.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"strings"
config "github.com/c3os-io/c3os/pkg/config"
"github.com/c3os-io/c3os/pkg/utils"
config "github.com/kairos-io/kairos/pkg/config"
"github.com/kairos-io/kairos/pkg/utils"
)
type GrubOptions struct{}

2
internal/agent/hooks/hook.go
View File

@ -1,7 +1,7 @@
package hook
import (
config "github.com/c3os-io/c3os/pkg/config"
config "github.com/kairos-io/kairos/pkg/config"
)
type Interface interface {

4
internal/agent/hooks/lifecycle.go
View File

@ -1,8 +1,8 @@
package hook
import (
config "github.com/c3os-io/c3os/pkg/config"
"github.com/c3os-io/c3os/pkg/utils"
config "github.com/kairos-io/kairos/pkg/config"
"github.com/kairos-io/kairos/pkg/utils"
)
type Lifecycle struct{}

10
internal/agent/hooks/runstage.go
View File

@ -1,16 +1,16 @@
package hook
import (
config "github.com/c3os-io/c3os/pkg/config"
"github.com/c3os-io/c3os/pkg/utils"
config "github.com/kairos-io/kairos/pkg/config"
"github.com/kairos-io/kairos/pkg/utils"
events "github.com/c3os-io/c3os/sdk/bus"
events "github.com/kairos-io/kairos/sdk/bus"
)
type RunStage struct{}
func (r RunStage) Run(c config.Config) error {
utils.SH("elemental run-stage c3os-install.after") //nolint:errcheck
events.RunHookScript("/usr/bin/c3os-agent.install.after.hook") //nolint:errcheck
utils.SH("elemental run-stage kairos-install.after") //nolint:errcheck
events.RunHookScript("/usr/bin/kairos-agent.install.after.hook") //nolint:errcheck
return nil
}

18
internal/agent/install.go
View File

@ -10,17 +10,17 @@ import (
"syscall"
"time"
events "github.com/c3os-io/c3os/sdk/bus"
events "github.com/kairos-io/kairos/sdk/bus"
config "github.com/c3os-io/c3os/pkg/config"
config "github.com/kairos-io/kairos/pkg/config"
hook "github.com/c3os-io/c3os/internal/agent/hooks"
"github.com/c3os-io/c3os/internal/bus"
hook "github.com/kairos-io/kairos/internal/agent/hooks"
"github.com/kairos-io/kairos/internal/bus"
"github.com/c3os-io/c3os/internal/cmd"
"github.com/c3os-io/c3os/pkg/utils"
"github.com/kairos-io/kairos/internal/cmd"
"github.com/kairos-io/kairos/pkg/utils"
machine "github.com/c3os-io/c3os/pkg/machine"
machine "github.com/kairos-io/kairos/pkg/machine"
qr "github.com/mudler/go-nodepair/qrcode"
"github.com/mudler/go-pluggable"
"github.com/pterm/pterm"
@ -185,8 +185,8 @@ func Install(dir ...string) error {
}
func RunInstall(options map[string]string) error {
utils.SH("elemental run-stage c3os-install.pre") //nolint:errcheck
events.RunHookScript("/usr/bin/c3os-agent.install.pre.hook") //nolint:errcheck
utils.SH("elemental run-stage kairos-install.pre") //nolint:errcheck
events.RunHookScript("/usr/bin/kairos-agent.install.pre.hook") //nolint:errcheck
f, _ := ioutil.TempFile("", "xxxx")
defer os.RemoveAll(f.Name())

14
internal/agent/interactive_install.go
View File

@ -5,16 +5,16 @@ import (
"fmt"
"strings"
"github.com/c3os-io/c3os/internal/bus"
"github.com/c3os-io/c3os/internal/cmd"
config "github.com/c3os-io/c3os/pkg/config"
"github.com/kairos-io/kairos/internal/bus"
"github.com/kairos-io/kairos/internal/cmd"
config "github.com/kairos-io/kairos/pkg/config"
events "github.com/c3os-io/c3os/sdk/bus"
"github.com/c3os-io/c3os/sdk/unstructured"
events "github.com/kairos-io/kairos/sdk/bus"
"github.com/kairos-io/kairos/sdk/unstructured"
"github.com/c3os-io/c3os/pkg/utils"
"github.com/erikgeiser/promptkit/textinput"
"github.com/jaypipes/ghw"
"github.com/kairos-io/kairos/pkg/utils"
"github.com/mudler/go-pluggable"
"github.com/mudler/yip/pkg/schema"
"github.com/pterm/pterm"
@ -165,7 +165,7 @@ func InteractiveInstall(spawnShell bool) error {
return err
}
userName, err := prompt("User to setup", "c3os", canBeEmpty, true, false)
userName, err := prompt("User to setup", "kairos", canBeEmpty, true, false)
if err != nil {
return err
}

6
internal/agent/notify.go
View File

@ -3,9 +3,9 @@ package agent
import (
"fmt"
"github.com/c3os-io/c3os/internal/bus"
"github.com/c3os-io/c3os/pkg/config"
events "github.com/c3os-io/c3os/sdk/bus"
"github.com/kairos-io/kairos/internal/bus"
"github.com/kairos-io/kairos/pkg/config"
events "github.com/kairos-io/kairos/sdk/bus"
"github.com/mudler/go-pluggable"
)

10
internal/agent/recovery.go
View File

@ -4,12 +4,12 @@ import (
"fmt"
"time"
"github.com/c3os-io/c3os/internal/bus"
"github.com/c3os-io/c3os/internal/cmd"
"github.com/c3os-io/c3os/pkg/utils"
events "github.com/c3os-io/c3os/sdk/bus"
"github.com/kairos-io/kairos/internal/bus"
"github.com/kairos-io/kairos/internal/cmd"
"github.com/kairos-io/kairos/pkg/utils"
events "github.com/kairos-io/kairos/sdk/bus"
machine "github.com/c3os-io/c3os/pkg/machine"
machine "github.com/kairos-io/kairos/pkg/machine"
qr "github.com/mudler/go-nodepair/qrcode"
"github.com/mudler/go-pluggable"
"github.com/pterm/pterm"

6
internal/agent/reset.go
View File

@ -7,9 +7,9 @@ import (
"sync"
"time"
"github.com/c3os-io/c3os/internal/cmd"
"github.com/c3os-io/c3os/pkg/machine"
"github.com/c3os-io/c3os/pkg/utils"
"github.com/kairos-io/kairos/internal/cmd"
"github.com/kairos-io/kairos/pkg/machine"
"github.com/kairos-io/kairos/pkg/utils"
"github.com/pterm/pterm"
)

8
internal/agent/upgrade.go
View File

@ -8,11 +8,11 @@ import (
"os/exec"
"strings"
events "github.com/c3os-io/c3os/sdk/bus"
events "github.com/kairos-io/kairos/sdk/bus"
"github.com/c3os-io/c3os/internal/bus"
"github.com/c3os-io/c3os/pkg/github"
"github.com/c3os-io/c3os/pkg/utils"
"github.com/kairos-io/kairos/internal/bus"
"github.com/kairos-io/kairos/pkg/github"
"github.com/kairos-io/kairos/pkg/utils"
"github.com/mudler/go-pluggable"
)

2
internal/bus/bus.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"os"
"github.com/c3os-io/c3os/sdk/bus"
"github.com/kairos-io/kairos/sdk/bus"
"github.com/mudler/go-pluggable"
)

7
internal/c3os/branding.go
View File

@ -1,7 +0,0 @@
package c3os
import "path"
func BrandingFile(s string) string {
return path.Join("/etc", "c3os", "branding", s)
}

7
internal/cmd/utils.go
View File

@ -5,8 +5,9 @@ import (
"io/ioutil"
"os"
"github.com/c3os-io/c3os/internal/c3os"
"github.com/c3os-io/c3os/pkg/utils"
"github.com/kairos-io/kairos/internal/kairos"
"github.com/kairos-io/kairos/pkg/utils"
"github.com/pterm/pterm"
)
@ -16,7 +17,7 @@ func PrintText(f string, banner string) {
}
func PrintBranding(b []byte) {
brandingFile := c3os.BrandingFile("banner")
brandingFile := kairos.BrandingFile("banner")
if _, err := os.Stat(brandingFile); err == nil {
f, err := ioutil.ReadFile(brandingFile)
if err == nil {

7
internal/kairos/branding.go Normal file
View File

@ -0,0 +1,7 @@
package kairos
import "path"
func BrandingFile(s string) string {
return path.Join("/etc", "kairos", "branding", s)
}