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

Improve image pull check #255

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Improve image pull check #255

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50203c7
Improve image pull check
dimitar-kostadinov Sep 9, 2024
e182d64
Address PR review feedback
dimitar-kostadinov Sep 17, 2024
de9db16
Add select condition for platform.os linux and address PR review feed…
dimitar-kostadinov Sep 18, 2024
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
36 changes: 20 additions & 16 deletions test/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

mirrorv1alpha1 "github.com/gardener/gardener-extension-registry-cache/pkg/apis/mirror/v1alpha1"
registryv1alpha3 "github.com/gardener/gardener-extension-registry-cache/pkg/apis/registry/v1alpha3"
Expand Down Expand Up @@ -51,11 +52,11 @@ const (

// jqExtractRegistryLocation is a jq command that extracts the source location of the '/var/lib/registry' mount from the container's config.json file.
jqExtractRegistryLocation = `jq -j '.mounts[] | select(.destination=="/var/lib/registry") | .source' /run/containerd/io.containerd.runtime.v2.task/k8s.io/%s/config.json`
// jqCurrentManifestDigest is a jq command that extracts the manifest digest for the current OS architecture
jqCurrentManifestDigest = `jq -j '.manifests[] | select(.platform.architecture=="%s") | .digest' %s/docker/registry/v2/blobs/%s/data`
// jqLayersDigests is a jq command that extracts layers digests from the manifest
// Ref: https://github.com/opencontainers/image-spec/blob/main/manifest.md
jqLayersDigests = `jq -r '.layers[].digest' %s/docker/registry/v2/blobs/%s/data`
// jqExtractManifestDigest is a jq command that extracts the manifest digest for the current OS architecture.
jqExtractManifestDigest = `jq -j '.manifests[] | select(.platform.architecture=="%s") | .digest' %s/docker/registry/v2/blobs/%s/data`
// jqExtractLayersDigests is a jq command that extracts layers digests from the manifest.
// Ref: https://github.com/opencontainers/image-spec/blob/main/manifest.md.
jqExtractLayersDigests = `jq -r '.layers[].digest' %s/docker/registry/v2/blobs/%s/data`
)

// AddOrUpdateRegistryCacheExtension adds or updates registry-cache extension with the given caches to the given Shoot.
Expand Down Expand Up @@ -220,6 +221,17 @@ func VerifyRegistryCache(parentCtx context.Context, log logr.Logger, shootClient
By(fmt.Sprintf("Wait until %s Pod is running", name))
ExpectWithOffset(1, framework.WaitUntilPodIsRunning(ctx, log, pod.Name, pod.Namespace, shootClient)).To(Succeed())

// get the architecture of Node the Pod is running on
dimitar-kostadinov marked this conversation as resolved.
Show resolved Hide resolved
ExpectWithOffset(1, shootClient.Client().Get(ctx, client.ObjectKeyFromObject(pod), pod)).To(Succeed())
node := &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: pod.Spec.NodeName,
},
}
ExpectWithOffset(1, shootClient.Client().Get(ctx, client.ObjectKeyFromObject(node), node)).To(Succeed())
dimitar-kostadinov marked this conversation as resolved.
Show resolved Hide resolved
arch := node.Status.NodeInfo.Architecture
log.Info("Node architecture", "arch", arch)
dimitar-kostadinov marked this conversation as resolved.
Show resolved Hide resolved

By(fmt.Sprintf("Verify the registry cache pulled the %s image", image))
ctx, cancel = context.WithTimeout(parentCtx, 2*time.Minute)
defer cancel()
Expand Down Expand Up @@ -254,23 +266,15 @@ func VerifyRegistryCache(parentCtx context.Context, log logr.Logger, shootClient
imageIndexPath := sha256Path(string(output))
log.Info("Image index path under <repo-root>/docker/registry/v2/blobs/", "imageIndexPath", imageIndexPath)

output, err = rootPodExecutor.Execute(ctx, `dpkg --print-architecture | tr -d '\n'`)
if err != nil {
log.Error(err, "Failed to get the node architecture", "output", string(output))
return fmt.Errorf("failed to get the node architecture: %w", err)
}
arch := string(output)
log.Info("Node architecture", "arch", arch)

output, err = rootPodExecutor.Execute(ctx, fmt.Sprintf(jqCurrentManifestDigest, arch, registryRootPath, imageIndexPath))
output, err = rootPodExecutor.Execute(ctx, fmt.Sprintf(jqExtractManifestDigest, arch, registryRootPath, imageIndexPath))
if err != nil {
log.Error(err, "Failed to get the image manifests digest", "image", image, "output", string(output))
return fmt.Errorf("failed to get the %s image manifests digest: %w", image, err)
}
manifestPath := sha256Path(string(output))
log.Info("Image manifest path under <repo-root>/docker/registry/v2/blobs/", "image", image, "manifestPath", manifestPath)

output, err = rootPodExecutor.Execute(ctx, fmt.Sprintf(jqLayersDigests, registryRootPath, manifestPath))
output, err = rootPodExecutor.Execute(ctx, fmt.Sprintf(jqExtractLayersDigests, registryRootPath, manifestPath))
if err != nil {
log.Error(err, "Failed to get the image layers digests", "image", image, "output", string(output))
return fmt.Errorf("failed to get the %s image layers digests: %w", image, err)
Expand All @@ -285,7 +289,7 @@ func VerifyRegistryCache(parentCtx context.Context, log logr.Logger, shootClient
log.Error(err, "Failed to find image layer", "image", image, "digest", layerDigest)
errs = append(errs, fmt.Errorf("failed to find image %s layer with digest %s", image, layerDigest))
}
log.Info(fmt.Sprintf("Image %s layer with digest %s exist", image, layerDigest))
log.Info("Image layer exists", "image", image, "digest", layerDigest)
}

return errors.Join(errs...)
Expand Down