From ccec483726ce86956580668c99b8b075c09affcb Mon Sep 17 00:00:00 2001 From: Jian Zhang Date: Fri, 7 Feb 2025 09:55:19 +0800 Subject: [PATCH 1/2] debug CA --- catalogd/cmd/catalogd/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogd/cmd/catalogd/main.go b/catalogd/cmd/catalogd/main.go index e8b3ecf66..d2d7ebd68 100644 --- a/catalogd/cmd/catalogd/main.go +++ b/catalogd/cmd/catalogd/main.go @@ -285,8 +285,8 @@ func main() { SourceCtxFunc: func(ctx context.Context) (*types.SystemContext, error) { logger := log.FromContext(ctx) srcContext := &types.SystemContext{ - DockerCertPath: pullCasDir, - OCICertPath: pullCasDir, + DockerCertPath: "", + OCICertPath: "", } if _, err := os.Stat(authFilePath); err == nil && globalPullSecretKey != nil { logger.Info("using available authentication information for pulling image") From a85a205f7e3555ed2a7e2e1bc41407fbc05b3062 Mon Sep 17 00:00:00 2001 From: Jian Zhang Date: Fri, 7 Feb 2025 11:43:38 +0800 Subject: [PATCH 2/2] use pullCasDir --- catalogd/cmd/catalogd/main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/catalogd/cmd/catalogd/main.go b/catalogd/cmd/catalogd/main.go index d2d7ebd68..19a130ac7 100644 --- a/catalogd/cmd/catalogd/main.go +++ b/catalogd/cmd/catalogd/main.go @@ -284,9 +284,11 @@ func main() { imagePuller := &imageutil.ContainersImagePuller{ SourceCtxFunc: func(ctx context.Context) (*types.SystemContext, error) { logger := log.FromContext(ctx) - srcContext := &types.SystemContext{ - DockerCertPath: "", - OCICertPath: "", + srcContext := &types.SystemContext{} + logger.Info("pullCasDir", "value", pullCasDir) + if pullCasDir != "" { + srcContext.DockerCertPath = pullCasDir + srcContext.OCICertPath = pullCasDir } if _, err := os.Stat(authFilePath); err == nil && globalPullSecretKey != nil { logger.Info("using available authentication information for pulling image")