Use the platform for all image related operations (#2759)

Dynatrace · Feb 19, 2024 · 91d92e3 · 91d92e3
1 parent 73fa7e5
commit 91d92e3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/cmd/troubleshoot/image.go b/cmd/troubleshoot/image.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	dynatracev1beta1 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta1/dynakube"
+	"github.com/Dynatrace/dynatrace-operator/pkg/arch"
 	"github.com/go-logr/logr"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
@@ -87,7 +88,13 @@ func tryImagePull(ctx context.Context, keychain authn.Keychain, transport *http.
 		return err
 	}
 
-	_, err = remote.Get(imageReference, remote.WithContext(ctx), remote.WithAuthFromKeychain(keychain), remote.WithTransport(transport))
+	_, err = remote.Get(
+		imageReference,
+		remote.WithContext(ctx),
+		remote.WithAuthFromKeychain(keychain),
+		remote.WithTransport(transport),
+		remote.WithPlatform(arch.ImagePlatform),
+	)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/arch/consts.go b/pkg/arch/consts.go
@@ -1,16 +1,29 @@
 package arch
 
+import containerv1 "github.com/google/go-containerregistry/pkg/v1"
+
 const (
 	FlavorDefault     = "default"
 	FlavorMultidistro = "multidistro"
 
 	// These architectures are for the DynatraceAPI
+
 	ArchX86   = "x86"
 	ArchARM   = "arm"
 	ArchPPCLE = "ppcle"
 	ArchS390  = "s390"
 
 	// These architectures are for the Image Registry
+
 	AMDImageArch = "amd64"
 	ARMImageArch = "arm64"
+
+	DefaultImageOS = "linux"
+)
+
+var (
+	ImagePlatform = containerv1.Platform{
+		OS:           DefaultImageOS,
+		Architecture: ImageArch,
+	}
 )
diff --git a/pkg/injection/codemodule/installer/image/unpack.go b/pkg/injection/codemodule/installer/image/unpack.go
@@ -16,10 +16,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-const (
-	defaultOS = "linux"
-)
-
 type imagePullInfo struct {
 	imageCacheDir string
 	targetDir     string
@@ -52,10 +48,7 @@ func (installer Installer) pullImageInfo(imageName string) (*containerv1.Image,
 	image, err := remote.Image(ref, remote.WithContext(context.TODO()),
 		remote.WithAuthFromKeychain(installer.keychain),
 		remote.WithTransport(installer.transport),
-		remote.WithPlatform(containerv1.Platform{
-			OS:           defaultOS,
-			Architecture: arch.ImageArch,
-		}),
+		remote.WithPlatform(arch.ImagePlatform),
 	)
 	if err != nil {
 		return nil, errors.WithMessagef(err, "getting image %q", imageName)

diff --git a/pkg/oci/registry/client.go b/pkg/oci/registry/client.go
@@ -9,6 +9,7 @@ import (
 	"net/url"
 
 	dynatracev1beta1 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta1/dynakube"
+	"github.com/Dynatrace/dynatrace-operator/pkg/arch"
 	"github.com/Dynatrace/dynatrace-operator/pkg/oci/dockerkeychain"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
@@ -105,6 +106,7 @@ func (c *Client) GetImageVersion(ctx context.Context, imageName string) (ImageVe
 	options := []remote.Option{
 		remote.WithContext(ctx),
 		remote.WithTransport(c.transport),
+		remote.WithPlatform(arch.ImagePlatform),
 	}
 	if c.keychain != nil {
 		options = append(options, remote.WithAuthFromKeychain(c.keychain))
@@ -153,7 +155,12 @@ func (c *Client) PullImageInfo(ctx context.Context, imageName string) (*containe
 		return nil, errors.WithMessagef(err, "parsing reference %q:", imageName)
 	}
 
-	image, err := remote.Image(ref, remote.WithContext(ctx), remote.WithAuthFromKeychain(c.keychain), remote.WithTransport(c.transport))
+	image, err := remote.Image(ref,
+		remote.WithContext(ctx),
+		remote.WithAuthFromKeychain(c.keychain),
+		remote.WithTransport(c.transport),
+		remote.WithPlatform(arch.ImagePlatform),
+	)
 	if err != nil {
 		return nil, errors.WithMessagef(err, "getting image %q", imageName)
 	}