Initial commit

Signed-off-by: Alex Barbato <alex.j.barbato@gmail.com>
carvel-dev · Jan 6, 2024 · 59af189 · 59af189
1 parent 0b54783
commit 59af189
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/pkg/vendir/config/directory.go b/pkg/vendir/config/directory.go
@@ -116,6 +116,7 @@ type DirectoryContentsImage struct {
 	// +optional
 	SecretRef *DirectoryContentsLocalRef `json:"secretRef,omitempty"`
 
+	ResponseHeaderTimeout  int  `json:"responseHeaderTimeout,omitempty"`
 	DangerousSkipTLSVerify bool `json:"dangerousSkipTLSVerify,omitempty"`
 }
 
@@ -134,6 +135,7 @@ type DirectoryContentsImgpkgBundle struct {
 	// +optional
 	SecretRef *DirectoryContentsLocalRef `json:"secretRef,omitempty"`
 
+	ResponseHeaderTimeout  int  `json:"responseHeaderTimeout,omitempty"`
 	DangerousSkipTLSVerify bool `json:"dangerousSkipTLSVerify,omitempty"`
 	Recursive              bool `json:"recursive,omitempty"`
 }

diff --git a/pkg/vendir/fetch/image/imgpkg.go b/pkg/vendir/fetch/image/imgpkg.go
@@ -26,6 +26,7 @@ const (
 type ImgpkgOpts struct {
 	SecretRef              *ctlconf.DirectoryContentsLocalRef
 	DangerousSkipTLSVerify bool
+	ResponseHeaderTimeout  int
 
 	EnvironFunc func() []string
 }
@@ -158,7 +159,7 @@ func (t *Imgpkg) RegistryOpts() (registry.Opts, error) {
 	opts := registry.Opts{
 		VerifyCerts:           !t.opts.DangerousSkipTLSVerify,
 		Insecure:              false,
-		ResponseHeaderTimeout: 30 * time.Second,
+		ResponseHeaderTimeout: time.Duration(t.opts.ResponseHeaderTimeout|30) * time.Second,
 		RetryCount:            5,
 		EnvironFunc: func() []string {
 			return append(envVariables, t.opts.EnvironFunc()...)

diff --git a/pkg/vendir/fetch/image/sync.go b/pkg/vendir/fetch/image/sync.go
@@ -21,6 +21,7 @@ func NewSync(opts ctlconf.DirectoryContentsImage, refFetcher ctlfetch.RefFetcher
 	imgpkgOpts := ImgpkgOpts{
 		SecretRef:              opts.SecretRef,
 		DangerousSkipTLSVerify: opts.DangerousSkipTLSVerify,
+		ResponseHeaderTimeout:  opts.ResponseHeaderTimeout,
 	}
 	return &Sync{opts, NewImgpkg(imgpkgOpts, refFetcher, c)}
 }

diff --git a/pkg/vendir/fetch/imgpkgbundle/sync.go b/pkg/vendir/fetch/imgpkgbundle/sync.go
@@ -21,6 +21,7 @@ func NewSync(opts ctlconf.DirectoryContentsImgpkgBundle, refFetcher ctlfetch.Ref
 	imgpkgOpts := ctlimg.ImgpkgOpts{
 		SecretRef:              opts.SecretRef,
 		DangerousSkipTLSVerify: opts.DangerousSkipTLSVerify,
+		ResponseHeaderTimeout:  opts.ResponseHeaderTimeout,
 	}
 	return &Sync{opts, ctlimg.NewImgpkg(imgpkgOpts, refFetcher, c)}
 }