openshift/image-registry
1
0
Fork 0
mirror of https://github.com/openshift/image-registry.git synced 2026-02-05 09:45:55 +01:00
Code Issues Releases Activity

Revert "Support authentication using gcp workload identity federation"

Browse Source
This commit is contained in:
Oleg Bulatov
2022-03-24 19:04:02 +01:00
parent 350cf2965f
commit 8881c4e145
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -44,6 +44,6 @@ require (
)
replace (
github.com/docker/distribution => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220301160838-358c338d67ed+incompatible
github.com/docker/distribution => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220324175950-edc8e1008cc5+incompatible
google.golang.org/api => google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff
)

4
go.sum
View File

@@ -549,8 +549,8 @@ github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mo
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 h1:SG1aqwleU6bGD0X4mhkTNupjVnByMYYuW4XbnCPavQU=
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY=
github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220301160838-358c338d67ed+incompatible h1:F3fEciQp+b0Bw/ancFh15bVk36raCH25q/1Upii4UiU=
github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220301160838-358c338d67ed+incompatible/go.mod h1:XmfFzbwryblvZ29NebonirM7RBuNEO7+yVCOapaouAk=
github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220324175950-edc8e1008cc5+incompatible h1:szWNPm/OnENRhWrw35KuueyGB6N3FUHWpdIO0tKXEk4=
github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220324175950-edc8e1008cc5+incompatible/go.mod h1:XmfFzbwryblvZ29NebonirM7RBuNEO7+yVCOapaouAk=
github.com/openshift/library-go v0.0.0-20220210170159-18f172cff934 h1:J3cN1DNqF0/R8sDkg6n56iE/tka3bm/uRUy4vmuUTdg=
github.com/openshift/library-go v0.0.0-20220210170159-18f172cff934/go.mod h1:6AmNM4N4nHftckybV/U7bQW+5AvK5TW81ndSI6KEidw=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

8
vendor/github.com/docker/distribution/registry/storage/driver/gcs/gcs.go generated vendored
View File

@@ -154,11 +154,11 @@ func FromParameters(parameters map[string]interface{}) (storagedriver.StorageDri
if err != nil {
return nil, err
}
creds, err := google.CredentialsFromJSON(context.Background(), jsonKey, storage.ScopeFullControl)
jwtConf, err = google.JWTConfigFromJSON(jsonKey, storage.ScopeFullControl)
if err != nil {
return nil, err
}
ts = creds.TokenSource
ts = jwtConf.TokenSource(context.Background())
} else if credentials, ok := parameters["credentials"]; ok {
credentialMap, ok := credentials.(map[interface{}]interface{})
if !ok {
@@ -179,11 +179,11 @@ func FromParameters(parameters map[string]interface{}) (storagedriver.StorageDri
return nil, fmt.Errorf("Failed to marshal gcs credentials to json")
}
creds, err := google.CredentialsFromJSON(context.Background(), data, storage.ScopeFullControl)
jwtConf, err = google.JWTConfigFromJSON(data, storage.ScopeFullControl)
if err != nil {
return nil, err
}
ts = creds.TokenSource
ts = jwtConf.TokenSource(context.Background())
} else {
var err error
ts, err = google.DefaultTokenSource(context.Background(), storage.ScopeFullControl)

2
vendor/github.com/docker/distribution/vendor.conf generated vendored
View File

@@ -37,7 +37,7 @@ github.com/yvasiyarov/gorelic a9bba5b9ab508a086f9a12b8c51fab68478e2128
github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f3717f3bbd2bf41c223bc273068e6
golang.org/x/crypto c10c31b5e94b6f7a0283272dc2bb27163dcea24b
golang.org/x/net 4876518f9e71663000c348837735820161a42df7
golang.org/x/oauth2 a8dc77f794b698f200a57b3bbd77da000f86124e
golang.org/x/oauth2 045497edb6234273d67dbc25da3f2ddbc4c4cacf
golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb
google.golang.org/api 9bf6e6e569ff057f75d9604a46c52928f17d2b54
google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19

2
vendor/modules.txt vendored
View File

@@ -93,7 +93,7 @@ github.com/davecgh/go-spew/spew
github.com/denverdino/aliyungo/common
github.com/denverdino/aliyungo/oss
github.com/denverdino/aliyungo/util
# github.com/docker/distribution v0.0.0-20180920194744-16128bbac47f => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220301160838-358c338d67ed+incompatible
# github.com/docker/distribution v0.0.0-20180920194744-16128bbac47f => github.com/openshift/docker-distribution v2.5.0-rc.1.0.20220324175950-edc8e1008cc5+incompatible
github.com/docker/distribution
github.com/docker/distribution/configuration
github.com/docker/distribution/context