Skip to content

Adding custom test image repo to remove ttl.sh #301

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

Merged
tommyd450 merged 9 commits into from
Aug 5, 2026
Merged

Adding custom test image repo to remove ttl.sh #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
34d6d64
Adding custom test image repo to remove ttl.sh
tommyd450 Aug 4, 2026
18251eb
Updating to point to securesign repo
tommyd450 Aug 4, 2026
21ba1b3
Updating e2e to be e2e-tests
tommyd450 Aug 4, 2026
d1810a0
Removing Prefix requirement
tommyd450 Aug 4, 2026
40ca3ab
Adding back vars
tommyd450 Aug 4, 2026
203f52b
Matching digest for test run
tommyd450 Aug 5, 2026
3b93435
Test fix
tommyd450 Aug 5, 2026
d40e5bf
Ensure same digest is used at all stages
tommyd450 Aug 5, 2026
ef35efc
New Upgrade Image
tommyd450 Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions test/e2e/update_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ import (
const (
updateTrustRootName = "update-trust-root"
updatedClusterImagePolicyName = "update-cip"
updateTestImageEnv = "UPDATE_TEST_IMAGE"
)

var updateTestImage string

var _ = Describe("policy-controller-operator update reconciliation", Ordered, Serial, func() {

BeforeAll(func(ctx SpecContext) {
updateTestImage = e2e_utils.PrepareImage(ctx, updateTestImageEnv)
})

AfterAll(func(ctx SpecContext) {
Expect(e2e_utils.DeleteResource(ctx, k8sClient, schema.GroupVersionKind{Group: "policy.sigstore.dev", Version: "v1beta1", Kind: "ClusterImagePolicy"}, updatedClusterImagePolicyName, "")).To(Succeed())
Expect(e2e_utils.DeleteResource(ctx, k8sClient, schema.GroupVersionKind{Group: "policy.sigstore.dev", Version: "v1alpha1", Kind: "TrustRoot"}, updateTrustRootName, "")).To(Succeed())
Expand Down Expand Up @@ -130,8 +137,8 @@ var _ = Describe("policy-controller-operator update reconciliation", Ordered, Se
"REKOR_URL": e2e_utils.RekorUrl(),
"OIDC_ISSUER_URL": e2e_utils.OidcIssuerUrl(),
"OIDC_ISSUER_SUBJECT": e2e_utils.OidcIssuerSubject(),
"TEST_IMAGE": commonTestImage,
"TEST_IMAGE_PREFIX": e2e_utils.ImageRepoPrefix(commonTestImage),
"TEST_IMAGE": updateTestImage,
"TEST_IMAGE_PREFIX": e2e_utils.ImageRepoPrefix(updateTestImage),
"TRUST_ROOT_REF": updateTrustRootName,
"CIP_NAME": updatedClusterImagePolicyName,
})
Expand Down Expand Up @@ -167,8 +174,8 @@ var _ = Describe("policy-controller-operator update reconciliation", Ordered, Se
"REKOR_URL": e2e_utils.RekorUrl(),
"OIDC_ISSUER_URL": e2e_utils.OidcIssuerUrl(),
"OIDC_ISSUER_SUBJECT": updatedSubject,
"TEST_IMAGE": commonTestImage,
"TEST_IMAGE_PREFIX": e2e_utils.ImageRepoPrefix(commonTestImage),
"TEST_IMAGE": updateTestImage,
"TEST_IMAGE_PREFIX": e2e_utils.ImageRepoPrefix(updateTestImage),
"TRUST_ROOT_REF": updateTrustRootName,
"CIP_NAME": updatedClusterImagePolicyName,
})
Expand Down
2 changes: 1 addition & 1 deletion test/utils/custom_resources/cluster_image_policies/common_cluster_image_policy.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: {{ .CIP_NAME }}
spec:
images:
- glob: "{{ .TEST_IMAGE_PREFIX }}**"
- glob: "{{ .TEST_IMAGE }}"
authorities:
- keyless:
url: {{ .FULCIO_URL }}
Expand Down
30 changes: 25 additions & 5 deletions test/utils/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import (
"os"
"strings"

"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1/mutate"
"github.com/google/go-containerregistry/pkg/v1/random"
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/google/uuid"
Expand All @@ -17,18 +19,28 @@ func PrepareImage(ctx context.Context, imageENV string) string {
return v
}

image, err := random.Image(1024, 8)
img, err := random.Image(1024, 8)
if err != nil {
panic(err.Error())
}

targetImageName := fmt.Sprintf("ttl.sh/%s:15m", uuid.New().String())
cfg, err := img.ConfigFile()
if err != nil {
panic(err.Error())
}
cfg.Config.Labels = map[string]string{"quay.expires-after": "2h"}
image, err := mutate.ConfigFile(img, cfg)
if err != nil {
panic(err.Error())
}

targetImageName := fmt.Sprintf("quay.io/securesign/e2e-tests:%s", uuid.New().String())
ref, err := name.ParseReference(targetImageName)
if err != nil {
panic(err.Error())
}

pusher, err := remote.NewPusher()
pusher, err := remote.NewPusher(remote.WithAuthFromKeychain(authn.DefaultKeychain))
if err != nil {
panic(err.Error())
}
Expand All @@ -37,10 +49,17 @@ func PrepareImage(ctx context.Context, imageENV string) string {
if err != nil {
panic(err.Error())
}
if err = os.Setenv(imageENV, targetImageName); err != nil {

desc, err := remote.Head(ref, remote.WithAuthFromKeychain(authn.DefaultKeychain))
if err != nil {
panic(err.Error())
}
digestRef := fmt.Sprintf("quay.io/securesign/e2e-tests@%s", desc.Digest.String())

if err = os.Setenv(imageENV, digestRef); err != nil {
panic(err.Error())
}
return targetImageName
return digestRef
}

func ImageRepoPrefix(image string) string {
Expand All @@ -49,3 +68,4 @@ func ImageRepoPrefix(image string) string {
}
return image
}

Loading