Skip to content

OCPBUGS-79425: adding cred helpers to dockerconfigjson struct #5795

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

Open
dalemcgavin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-79425: adding cred helpers to dockerconfigjson struct #5795

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/controller/common/dockerconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,11 @@ func TestMergeDockerConfigstoJSONMap(t *testing.T) {
})
}
}

func TestCredHelpers(t *testing.T) {
raw := `{"auths": {"foo": {"auth": "bar", "email": "baz"}}, "credHelpers": {}}`
_, err := ConvertSecretTodockercfg([]byte(raw))
if err != nil {
t.Fatal(err)
}
}
3 changes: 2 additions & 1 deletion pkg/secrets/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ func newImageRegistrySecretFromAny(in any) (ImageRegistrySecret, error) {
// DockerConfigJSON represents the ~/.docker/config.json file information.
// This is the newer-style format which maps to `kubernetes.io/dockerconfigjson` secret type.
type DockerConfigJSON struct {
Auths DockerConfig `json:"auths,omitempty"`
Auths DockerConfig `json:"auths,omitempty"`
CredHelpers map[string]string `json:"credHelpers,omitempty"`
}

// newDockerConfigJSON creates and returns a new, empty DockerConfigJSON struct.
Expand Down