Skip to content
This repository was archived by the owner on Jan 13, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/apprepository-controller/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func newRootCmd() *cobra.Command {
Short: "Apprepository-controller is a Kubernetes controller for managing package repositories added to Kubeapps.",
PreRun: func(cmd *cobra.Command, args []string) {
initServerOpts()
log.Infof("Apprepository-controller has been configured with: %#v", serveOpts)
log.InfoS("The component 'apprepository-controller' has been configured with", "serverOptions", serveOpts)
},
RunE: func(cmd *cobra.Command, args []string) error {

Expand Down
2 changes: 1 addition & 1 deletion cmd/apprepository-controller/server/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func NewController(
},
})
if err != nil {
log.Warningf("error adding AppRepository event handler: %v", err)
log.Warningf("Error adding AppRepository event handler: %v", err)
}

controller.setBatchLister(conf.V1Beta1CronJobs, kubeInformerFactory)
Expand Down
2 changes: 1 addition & 1 deletion cmd/asset-syncer/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func newRootCmd() *cobra.Command {
serveOpts.UserAgent = server.GetUserAgent(version, serveOpts.UserAgentComment)
serveOptsCopy := serveOpts
serveOptsCopy.DatabasePassword = "REDACTED"
log.Infof("asset-syncer has been configured with: %#v", serveOptsCopy)
log.InfoS("The component 'asset-syncer' has been configured with", "serverOptions", serveOptsCopy)
},
Version: "devel",
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/asset-syncer/server/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ func Delete(serveOpts Config, args []string) error {
dbConfig := dbutils.Config{URL: serveOpts.DatabaseURL, Database: serveOpts.DatabaseName, Username: serveOpts.DatabaseUser, Password: serveOpts.DatabasePassword}
manager, err := newManager(dbConfig, serveOpts.GlobalPackagingNamespace)
if err != nil {
return fmt.Errorf("Error file creating a manager: %v", err)
return fmt.Errorf("error file creating a manager: %v", err)
}
err = manager.Init()
if err != nil {
return fmt.Errorf("Error file initializing the manager: %v", err)
return fmt.Errorf("error file initializing the manager: %v", err)
}
defer manager.Close()

repo := models.Repo{Name: args[0], Namespace: serveOpts.Namespace}
if err = manager.Delete(repo); err != nil {
return fmt.Errorf("Can't delete chart repository %s from database: %v", args[0], err)
return fmt.Errorf("can't delete chart repository %s from database: %v", args[0], err)
}

log.Infof("Successfully deleted the chart repository %s from database", args[0])
Expand Down
8 changes: 4 additions & 4 deletions cmd/asset-syncer/server/invalidate-cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ import (

func InvalidateCache(serveOpts Config, args []string) error {
if len(args) != 0 {
return fmt.Errorf("This command does not take any arguments (got %v)", len(args))
return fmt.Errorf("this command does not take any arguments (got %v)", len(args))
}

dbConfig := dbutils.Config{URL: serveOpts.DatabaseURL, Database: serveOpts.DatabaseName, Username: serveOpts.DatabaseUser, Password: serveOpts.DatabasePassword}
manager, err := newManager(dbConfig, serveOpts.GlobalPackagingNamespace)
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
err = manager.Init()
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
defer manager.Close()

err = manager.InvalidateCache()
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
log.Infof("Successfully invalidated cache")
return nil
Expand Down
24 changes: 12 additions & 12 deletions cmd/asset-syncer/server/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ import (

func Sync(serveOpts Config, version string, args []string) error {
if len(args) != 3 {
return fmt.Errorf("Need exactly three arguments: [REPO NAME] [REPO URL] [REPO TYPE] (got %v)", len(args))
return fmt.Errorf("need exactly three arguments: [REPO NAME] [REPO URL] [REPO TYPE] (got %v)", len(args))
}

dbConfig := dbutils.Config{URL: serveOpts.DatabaseURL, Database: serveOpts.DatabaseName, Username: serveOpts.DatabaseUser, Password: serveOpts.DatabasePassword}
globalPackagingNamespace := serveOpts.GlobalPackagingNamespace
manager, err := newManager(dbConfig, globalPackagingNamespace)
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
err = manager.Init()
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
defer manager.Close()

netClient, err := httpclient.NewWithCertFile(additionalCAFile, serveOpts.TlsInsecureSkipVerify)
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}

authorizationHeader := serveOpts.AuthorizationHeader
Expand All @@ -43,17 +43,17 @@ func Sync(serveOpts Config, version string, args []string) error {
dockerConfig := &kube.DockerConfigJSON{}
err = json.Unmarshal([]byte(serveOpts.DockerConfigJson), dockerConfig)
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
authorizationHeader, err = kube.GetAuthHeaderFromDockerConfig(dockerConfig)
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
}

filters, err := parseFilters(serveOpts.FilterRules)
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}

var repoIface Repo
Expand All @@ -63,12 +63,12 @@ func Sync(serveOpts Config, version string, args []string) error {
repoIface, err = getOCIRepo(serveOpts.Namespace, args[0], args[1], authorizationHeader, filters, serveOpts.OciRepositories, netClient)
}
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
repo := repoIface.Repo()
checksum, err := repoIface.Checksum()
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}

// Check if the repo has been already processed
Expand All @@ -92,14 +92,14 @@ func Sync(serveOpts Config, version string, args []string) error {
for _, fetchLatestOnly := range fetchLatestOnlySlice {
charts, err := repoIface.Charts(fetchLatestOnly)
if err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}
if len(charts) == 0 {
log.Infof("No charts in repository to be synced, repo.URL= %v", repo.URL)
return nil
}
if err = manager.Sync(models.Repo{Name: repo.Name, Namespace: repo.Namespace}, charts); err != nil {
return fmt.Errorf("Can't add chart repository to database: %v", err)
return fmt.Errorf("can't add chart repository to database: %v", err)
}

// Fetch and store chart icons
Expand All @@ -111,7 +111,7 @@ func Sync(serveOpts Config, version string, args []string) error {

// Update cache in the database
if err = manager.UpdateLastCheck(repo.Namespace, repo.Name, checksum, time.Now()); err != nil {
return fmt.Errorf("Error: %v", err)
return fmt.Errorf("error: %v", err)
}

log.Infof("Stored repository update in cache, repo.URL= %v", repo.URL)
Expand Down
Loading