Skip to content
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

Jump to bottom

Optimize the pullsecret function #545

Merged
merged 1 commit into from
Dec 10, 2021
Merged

Optimize the pullsecret function #545

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions controllers/cloud.redhat.com/providers/pullsecrets/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var CoreConfigSecret = rc.NewSingleResourceIdent(ProvName, "core_config_secret",
// NewPullSecretProvider returns a new End provider run at the end of the provider set.
func NewPullSecretProvider(p *providers.Provider) (providers.ClowderProvider, error) {

secList, err := copyPullSecrets(p, p.Env)
secList, err := copyPullSecrets(p, p.Env.Status.TargetNamespace, p.Env)

if err != nil {
return nil, err
Expand All @@ -46,13 +46,7 @@ func NewPullSecretProvider(p *providers.Provider) (providers.ClowderProvider, er
return &pullsecretProvider{Provider: *p}, nil
}

func copyPullSecrets(prov *providers.Provider, obj object.ClowdObject) ([]string, error) {
var namespace string
if env, ok := obj.(*crd.ClowdEnvironment); ok {
namespace = env.Status.TargetNamespace
} else if app, ok := obj.(*crd.ClowdApp); ok {
namespace = app.Namespace
}
func copyPullSecrets(prov *providers.Provider, namespace string, obj object.ClowdObject) ([]string, error) {

var secList []string

Expand Down Expand Up @@ -102,7 +96,7 @@ func copyPullSecrets(prov *providers.Provider, obj object.ClowdObject) ([]string

func (ps *pullsecretProvider) Provide(app *crd.ClowdApp, c *config.AppConfig) error {

secList, err := copyPullSecrets(&ps.Provider, app)
secList, err := copyPullSecrets(&ps.Provider, app.Namespace, app)

if err != nil {
return err
Expand Down