Skip to content

Commit 595e171

Browse files
pin clip version (#1539)
Co-authored-by: Luke Lombardi <luke@beam.cloud>
1 parent ae314b8 commit 595e171

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

pkg/common/config.default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ imageService:
101101
# That gives 1200 / 1e+10 = 120 ns per byte.
102102
archiveNanosecondsPerByte: 120
103103
# Default to clip v2 (index-only OCI archives). Set to 1 to force legacy.
104-
clipVersion: 2
104+
clipVersion: 1
105105
registryStore: local
106106
registryCredentialProvider: docker
107107
buildRegistry: registry.localhost:5000

pkg/scheduler/scheduler.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -356,19 +356,12 @@ func (s *Scheduler) scheduleRequest(worker *types.Worker, request *types.Contain
356356
// attachImageCredentials fetches and attaches OCI credentials to a container request
357357
func (s *Scheduler) attachImageCredentials(request *types.ContainerRequest) error {
358358
if request.ImageId == "" {
359-
log.Debug().
360-
Str("container_id", request.ContainerId).
361-
Msg("no image ID, skipping credential attachment")
362359
return nil
363360
}
364361

365362
// Skip credential attachment for build containers - they already have credentials
366363
// in BuildOptions.SourceImageCreds for pulling the base image during the build
367364
if strings.HasPrefix(request.ContainerId, types.BuildContainerPrefix) {
368-
log.Debug().
369-
Str("container_id", request.ContainerId).
370-
Str("image_id", request.ImageId).
371-
Msg("build container, skipping credential attachment")
372365
return nil
373366
}
374367

@@ -425,10 +418,6 @@ func (s *Scheduler) attachBuildRegistryCredentials(request *types.ContainerReque
425418
// Check if we have credentials configured for the build registry
426419
buildRegistryCredentials := s.config.ImageService.BuildRegistryCredentials
427420
if buildRegistryCredentials.Type == "" || len(buildRegistryCredentials.Credentials) == 0 {
428-
log.Debug().
429-
Str("container_id", request.ContainerId).
430-
Str("build_registry", buildRegistry).
431-
Msg("no build registry credentials in config, will use ambient auth")
432421
return nil
433422
}
434423

0 commit comments

Comments
 (0)