Skip to content

Commit 51c0028

Browse files
committed
Address review feedback
Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
1 parent 737f66c commit 51c0028

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

cmd/thv/app/run_flags.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,12 @@ func buildRunnerConfig(
559559
imageMetadata = md
560560
}
561561

562+
// Extract registry proxy port from remote server metadata
563+
var registryProxyPort int
564+
if remoteMd, ok := serverMetadata.(*regtypes.RemoteServerMetadata); ok && remoteMd != nil {
565+
registryProxyPort = remoteMd.ProxyPort
566+
}
567+
562568
// Build default options
563569
opts := []runner.RunConfigBuilderOption{
564570
runner.WithRuntime(rt),
@@ -603,6 +609,11 @@ func buildRunnerConfig(
603609
}
604610
opts = append(opts, remoteHeaderOpts...)
605611

612+
// Use registry proxy port for remote servers if CLI flag is not set
613+
if registryProxyPort > 0 {
614+
opts = append(opts, runner.WithRegistryProxyPort(registryProxyPort))
615+
}
616+
606617
// Configure runtime options
607618
runtimeOpts := configureRuntimeOptions(runFlags)
608619
opts = append(opts, runtimeOpts...)
@@ -723,11 +734,6 @@ func configureRemoteAuth(runFlags *RunFlags, serverMetadata regtypes.ServerMetad
723734
}
724735

725736
opts = append(opts, runner.WithRemoteAuth(remoteAuthConfig), runner.WithRemoteURL(remoteServerMetadata.URL))
726-
727-
// Use registry proxy port for remote servers if CLI flag is not set
728-
if remoteServerMetadata.ProxyPort > 0 {
729-
opts = append(opts, runner.WithRegistryProxyPort(remoteServerMetadata.ProxyPort))
730-
}
731737
}
732738

733739
if runFlags.RemoteURL != "" {

0 commit comments

Comments
 (0)