Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/container' into architecture
Browse files Browse the repository at this point in the history
  • Loading branch information
Mehul-Kumar-27 committed Nov 19, 2024
2 parents b950c1c + 1e8dc43 commit 2aa1a46
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
9 changes: 6 additions & 3 deletions cmd/container_runtime/crio.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func GenerateCrioRegistryConfig(defaultZotConfig *registry.DefaultZotConfig, cri
// If there is a registry with the prefix satellite, update the location to the local registry
found = false
for _, registries := range crioRegistryConfig.Registries {
if registries.Prefix == "satellite" {
if registries.Prefix == "satellite.io" {
found = true
if registries.Location == "" {
registries.Location = DockerURL
Expand All @@ -112,7 +112,7 @@ func GenerateCrioRegistryConfig(defaultZotConfig *registry.DefaultZotConfig, cri
if !found {
// Add the satellite registry to the registries
registry := Registry{
Prefix: "satellite",
Prefix: "satellite.io",
Location: DockerURL,
Mirrors: []Mirror{
{
Expand Down Expand Up @@ -143,7 +143,10 @@ func GenerateCrioRegistryConfig(defaultZotConfig *registry.DefaultZotConfig, cri

func SetupContainerRuntimeCommand(cmd *cobra.Command, defaultZotConfig **registry.DefaultZotConfig, defaultGenPath string) error {
var err error
config.InitConfig()
err = config.InitConfig()
if err != nil {
return fmt.Errorf("could not initialize config: %w", err)
}
utils.SetupContextForCommand(cmd)
log := logger.FromContext(cmd.Context())

Expand Down
2 changes: 1 addition & 1 deletion cmd/container_runtime/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
)

const (
SatelliteConfigPath = "satellite"
SatelliteConfigPath = "satellite.io"
HostToml = "host_gen.toml"
DefaultTomlConfigPath = "_default"
DockerURL = "docker.io"
Expand Down
7 changes: 0 additions & 7 deletions runtime/containerd/config.toml

This file was deleted.

0 comments on commit 2aa1a46

Please sign in to comment.