public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Support mirror registries with path component (#1707)" (#1794) 

* Revert "Support mirror registries with path component (#1707)"

This reverts commit 4e218f2162.

* fix tests and add co-sign back
This commit is contained in:
Tejal Desai 2021-10-20 19:13:24 -07:00 committed by GitHub
parent 4e841f2cd6
commit ee31dc93b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/release.yaml vendored
View File

@ -72,13 +72,9 @@ jobs:
# Use cosign to sign the images # Use cosign to sign the images
- run: | - run: |
export KMS_VAL=gcpkms://projects/kaniko-project/locations/global/keyRings/cosign/cryptoKeys/cosign export KMS_VAL=gcpkms://projects/kaniko-project/locations/global/keyRings/cosign/cryptoKeys/cosign
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}-slim
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:slim
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }} cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }} cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:latest cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:latest
build-debug: build-debug:
env: env:
@ -274,3 +270,17 @@ jobs:
gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim
gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}-slim gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}-slim
gcr.io/kaniko-project/executor:slim gcr.io/kaniko-project/executor:slim
- name: Sign images
uses: sigstore/cosign-installer@main
with:
cosign-release: 'v0.2.0'
# Use cosign to sign the images
- run: |
export KMS_VAL=gcpkms://projects/kaniko-project/locations/global/keyRings/cosign/cryptoKeys/cosign
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}-slim
cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:slim

4
integration/integration_test.go
View File

@ -389,8 +389,8 @@ func TestBuildViaRegistryMirrors(t *testing.T) {
dockerRunFlags = append(dockerRunFlags, ExecutorImage, dockerRunFlags = append(dockerRunFlags, ExecutorImage,
"-f", dockerfile, "-f", dockerfile,
"-d", kanikoImage, "-d", kanikoImage,
"--registry-mirror", "doesnotexist.example.com/test", "--registry-mirror", "doesnotexist.example.com",
"--registry-mirror", "us-mirror.gcr.io/test", "--registry-mirror", "us-mirror.gcr.io",
"-c", fmt.Sprintf("git://%s", repo)) "-c", fmt.Sprintf("git://%s", repo))
kanikoCmd := exec.Command("docker", dockerRunFlags...) kanikoCmd := exec.Command("docker", dockerRunFlags...)

21
pkg/image/remote/remote.go
View File

@ -57,16 +57,16 @@ func RetrieveRemoteImage(image string, opts config.RegistryOptions, customPlatfo
} }
for _, registryMirror := range opts.RegistryMirrors { for _, registryMirror := range opts.RegistryMirrors {
var newRepo name.Repository var newReg name.Registry
if opts.InsecurePull || opts.InsecureRegistries.Contains(registryMirror) { if opts.InsecurePull || opts.InsecureRegistries.Contains(registryMirror) {
newRepo, err = name.NewRepository(registryMirror, name.WeakValidation, name.Insecure) newReg, err = name.NewRegistry(registryMirror, name.WeakValidation, name.Insecure)
} else { } else {
newRepo, err = name.NewRepository(registryMirror, name.StrictValidation) newReg, err = name.NewRegistry(registryMirror, name.StrictValidation)
} }
if err != nil { if err != nil {
return nil, err return nil, err
} }
ref := setNewRepository(ref, newRepo) ref := setNewRegistry(ref, newReg)
logrus.Infof("Retrieving image %s from registry mirror %s", ref, registryMirror) logrus.Infof("Retrieving image %s from registry mirror %s", ref, registryMirror)
remoteImage, err := remote.Image(ref, remoteOptions(registryMirror, opts, customPlatform)...) remoteImage, err := remote.Image(ref, remoteOptions(registryMirror, opts, customPlatform)...)
@ -113,19 +113,6 @@ func normalizeReference(ref name.Reference, image string) (name.Reference, error
return ref, nil return ref, nil
} }
func setNewRepository(ref name.Reference, newRepo name.Repository) name.Reference {
switch r := ref.(type) {
case name.Tag:
r.Repository = newRepo
return r
case name.Digest:
r.Repository = newRepo
return r
default:
return ref
}
}
func setNewRegistry(ref name.Reference, newReg name.Registry) name.Reference { func setNewRegistry(ref name.Reference, newReg name.Registry) name.Reference {
switch r := ref.(type) { switch r := ref.(type) {
case name.Tag: case name.Tag: