Skip to content

Commit

Permalink
Merge pull request #212 from kndpio/211-default-registry-setup-do-not…
Browse files Browse the repository at this point in the history
…-update-crossplane

fixed default registry creation
  • Loading branch information
evghen1 authored Oct 3, 2024
2 parents 3fa343d + 519c4bf commit 7bb9274
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions internal/registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ func (r *Registry) Create(ctx context.Context, config *rest.Config, logger *zap.
return err
}

installer, err := engine.GetEngine(config)
if err != nil {
return err
}
release, _ := installer.GetRelease()

if r.Local {
logger.Debug("Create Local Registry")
err := r.CreateLocal(ctx, client)
Expand All @@ -153,11 +159,6 @@ func (r *Registry) Create(ctx context.Context, config *rest.Config, logger *zap.
} else {
logger.Debug("Create Registry")

installer, err := engine.GetEngine(config)
if err != nil {
return err
}
release, _ := installer.GetRelease()
r.Name = r.Domain()
serverUrls := []string{}
for _, auth := range r.Config.Auths {
Expand Down Expand Up @@ -217,42 +218,41 @@ func (r *Registry) Create(ctx context.Context, config *rest.Config, logger *zap.
if err != nil {
return err
}
}

if release.Config == nil {
release.Config = map[string]interface{}{
"imagePullSecrets": []interface{}{},
}
if release.Config == nil {
release.Config = map[string]interface{}{
"imagePullSecrets": []interface{}{},
}
if release.Config["imagePullSecrets"] == nil {
release.Config["imagePullSecrets"] = []interface{}{}
}
if release.Config["imagePullSecrets"] == nil {
release.Config["imagePullSecrets"] = []interface{}{}
}
release.Config["imagePullSecrets"] = append(
release.Config["imagePullSecrets"].([]interface{}),
r.Name,
)
if r.Default {
logger.Debug("Set registry as default.")
if release.Config["args"] == nil {
release.Config["args"] = []interface{}{}
}
release.Config["imagePullSecrets"] = append(
release.Config["imagePullSecrets"].([]interface{}),
r.Name,
)
if r.Default {
logger.Debug("Set registry as default.")
if release.Config["args"] == nil {
release.Config["args"] = []interface{}{}
args := []string{}
for _, arg := range release.Config["args"].([]interface{}) {
if !strings.Contains(arg.(string), "--registry") {
args = append(args, arg.(string))
}
args := []string{}
for _, arg := range release.Config["args"].([]interface{}) {
if !strings.Contains(arg.(string), "--registry") {
args = append(args, arg.(string))
}
}

release.Config["args"] = append(
args,
"--registry="+r.Domain(),
)
}

logger.Debug("Upgrade Corssplane chart", "Values", release.Config)

return installer.Upgrade(engine.Version, release.Config)
release.Config["args"] = append(
args,
"--registry="+r.Domain(),
)
}
return nil

logger.Debug("Upgrade Corssplane chart", "Values", release.Config)

return installer.Upgrade(engine.Version, release.Config)
}

func (r *Registry) FromSecret(sec corev1.Secret) *Registry {
Expand Down

0 comments on commit 7bb9274

Please sign in to comment.