Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1842582: Don't include digest in source for ICSP when mirroring a catalog #445

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Bug 1842582: Don't include digest in source for ICSP when mirroring a catalog #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/cli/admin/catalog/mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,18 @@ func generateICSP(out io.Writer, name string, mapping map[string]Target) ([]byte
fmt.Fprintf(out, "no digest mapping available for %s, skip writing to ImageContentSourcePolicy\n", k)
continue
}
fromRef, err := imagesource.ParseReference(k)
if err != nil {
fmt.Fprintf(out, "error parsing source reference for %s, skip writing to ImageContentSourcePolicy\n", v)
continue
}
toRef, err := imagesource.ParseReference(v.WithDigest)
if err != nil {
fmt.Fprintf(out, "error parsing target reference for %s, skip writing to ImageContentSourcePolicy\n", v)
continue
}
icsp.Spec.RepositoryDigestMirrors = append(icsp.Spec.RepositoryDigestMirrors, operatorv1alpha1.RepositoryDigestMirrors{
Source: k,
Source: fromRef.Ref.AsRepository().String(),
Mirrors: []string{toRef.Ref.AsRepository().String()},
})
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/admin/catalog/mirror_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ spec:
repositoryDigestMirrors:
- mirrors:
- quay.io/olmtest/strimzi-operator
source: docker.io/strimzi/operator@sha256:d134a9865524c29fcf75bbc4469013bc38d8a15cb5f41acfddb6b9e492f556e4
source: docker.io/strimzi/operator
`,
),
},
Expand Down Expand Up @@ -151,7 +151,7 @@ spec:
repositoryDigestMirrors:
- mirrors:
- quay.io/olmtest/strimzi-operator
source: docker.io/strimzi/operator@sha256:d134a9865524c29fcf75bbc4469013bc38d8a15cb5f41acfddb6b9e492f556e4
source: docker.io/strimzi/operator
`,
),
},
Expand Down