Fix pull secret not found error preventing codeModulesImage download (#…

…3403) (#3407)
Dynatrace · Jul 4, 2024 · 838d0a2 · 838d0a2
1 parent b9f2759
commit 838d0a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pkg/oci/dockerkeychain/docker_keychain.go b/pkg/oci/dockerkeychain/docker_keychain.go
@@ -33,9 +33,9 @@ func (keychain *DockerKeychain) loadDockerConfigFromSecret(ctx context.Context,
 	}
 
 	if err := apiReader.Get(ctx, client.ObjectKey{Namespace: pullSecret.Namespace, Name: pullSecret.Name}, &pullSecret); err != nil {
-		log.Info("failed to load registry pull secret", "name", pullSecret.Name, "namespace", pullSecret.Namespace)
+		log.Info("No registry pull secret loaded", "name", pullSecret.Name, "namespace", pullSecret.Namespace, "err", err)
 
-		return errors.WithStack(err)
+		return nil
 	}
 
 	dockerAuths, err := extractDockerAuthsFromSecret(&pullSecret)

diff --git a/pkg/oci/dockerkeychain/docker_keychain_test.go b/pkg/oci/dockerkeychain/docker_keychain_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
-	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -24,7 +23,7 @@ const (
 )
 
 func TestNewDockerKeychain(t *testing.T) {
-	t.Run("secret not found", func(t *testing.T) {
+	t.Run("secret not found, try without secret", func(t *testing.T) {
 		pullSecret := corev1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-secret",
@@ -34,8 +33,7 @@ func TestNewDockerKeychain(t *testing.T) {
 		client := fake.NewClient()
 
 		_, err := NewDockerKeychain(context.TODO(), client, pullSecret)
-		require.Error(t, err)
-		require.True(t, k8sErrors.IsNotFound(err))
+		require.NoError(t, err)
 	})
 
 	t.Run("invalid format of docker secret dockerconfigjson", func(t *testing.T) {