Skip to content

gcrhelper: add automatic GCR/Artifact Registry auth on GCE #1124

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
jossy wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

gcrhelper: add automatic GCR/Artifact Registry auth on GCE #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a6291b
Add GCR helper implementation and tests for credential management
jossy Apr 9, 2026
23162f7
Add gcrhelper to the list of files in rep spec
jossy Apr 9, 2026
acd4422
Add gcrhelper to the list of files in auctioneer, bbs, cfdot, and rep…
jossy Apr 9, 2026
e4749f5
Add GCR helper integration to builder for credential management
jossy Apr 9, 2026
f3f0c64
Add gcrhelper to the list of files in docker_app_lifecycle spec
jossy Apr 9, 2026
867c0db
Merge branch 'cloudfoundry:develop' into develop
jossy Apr 9, 2026
64cf18f
Merge branch 'cloudfoundry:develop' into develop
jossy Apr 9, 2026
07aa853
Add gcrhelper to the list of files in auctioneer, bbs, and rep specs
jossy Apr 9, 2026
9eb8539
Move gcrhelper to the correct location in cfdot and rep_windows specs
jossy Apr 9, 2026
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
1 change: 1 addition & 0 deletions packages/auctioneer/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ files:
- code.cloudfoundry.org/ecrhelper/*.go # gosub
- code.cloudfoundry.org/executor/*.go # gosub
- code.cloudfoundry.org/executor/containermetrics/*.go # gosub
- code.cloudfoundry.org/gcrhelper/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-diodes/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/*.go # gosub
Expand Down
1 change: 1 addition & 0 deletions packages/bbs/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ files:
- code.cloudfoundry.org/ecrhelper/*.go # gosub
- code.cloudfoundry.org/executor/*.go # gosub
- code.cloudfoundry.org/executor/containermetrics/*.go # gosub
- code.cloudfoundry.org/gcrhelper/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-diodes/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/*.go # gosub
Expand Down
1 change: 1 addition & 0 deletions packages/cfdot/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ files:
- code.cloudfoundry.org/ecrhelper/*.go # gosub
- code.cloudfoundry.org/executor/*.go # gosub
- code.cloudfoundry.org/executor/containermetrics/*.go # gosub
- code.cloudfoundry.org/gcrhelper/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-diodes/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/*.go # gosub
Expand Down
1 change: 1 addition & 0 deletions packages/docker_app_lifecycle/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ files:
- code.cloudfoundry.org/dockerapplifecycle/launcher/*.go # gosub
- code.cloudfoundry.org/dockerapplifecycle/protocol/*.go # gosub
- code.cloudfoundry.org/ecrhelper/*.go # gosub
- code.cloudfoundry.org/gcrhelper/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/BurntSushi/toml/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/BurntSushi/toml/internal/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/aws/aws-sdk-go-v2/aws/*.go # gosub
Expand Down
1 change: 1 addition & 0 deletions packages/rep/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ files:
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/server/streamer/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/server/timebomb/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/transport/*.go # gosub
- code.cloudfoundry.org/gcrhelper/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-diodes/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/*.go # gosub
Expand Down
1 change: 1 addition & 0 deletions packages/rep_windows/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ files:
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/server/streamer/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/server/timebomb/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/transport/*.go # gosub
- code.cloudfoundry.org/gcrhelper/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-diodes/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/*.go # gosub
- code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/*.go # gosub
Expand Down
15 changes: 15 additions & 0 deletions src/code.cloudfoundry.org/dockerapplifecycle/builder/builder_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"code.cloudfoundry.org/dockerapplifecycle/helpers"
"code.cloudfoundry.org/dockerapplifecycle/protocol"
"code.cloudfoundry.org/ecrhelper"
"code.cloudfoundry.org/gcrhelper"
"github.com/containers/image/v5/types"
)

Expand All @@ -35,6 +36,7 @@ type Builder struct {
DockerPassword string
DockerEmail string
ECRHelper ecrhelper.ECRHelper
GCRHelper gcrhelper.GCRHelper
}

func (builder *Builder) Run(signals <-chan os.Signal, ready chan<- struct{}) error {
Expand Down Expand Up @@ -128,6 +130,19 @@ func (builder Builder) build() <-chan error {
}

func (builder Builder) getCredentials() (string, string, error) {
if builder.DockerUser == "" && builder.DockerPassword == "" {
isGCRRepo, err := builder.GCRHelper.IsGCRRepo(builder.RegistryURL)
if err != nil {
return "", "", fmt.Errorf(
"failed to check whether the registry URL is a GCR/Artifact Registry repo: %s",
err.Error(),
)
}
if isGCRRepo {
return builder.GCRHelper.GetGCRCredentials()
}
}

isECRRepo, err := builder.ECRHelper.IsECRRepo(builder.RegistryURL)
if err != nil {
return "", "", fmt.Errorf(
Expand Down
2 changes: 2 additions & 0 deletions src/code.cloudfoundry.org/dockerapplifecycle/builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"code.cloudfoundry.org/dockerapplifecycle/helpers"
"code.cloudfoundry.org/ecrhelper"
"code.cloudfoundry.org/gcrhelper"
"github.com/tedsuo/ifrit"
"github.com/tedsuo/ifrit/grouper"
"github.com/tedsuo/ifrit/sigmon"
Expand Down Expand Up @@ -141,6 +142,7 @@ func main() {
DockerPassword: *dockerPassword,
DockerEmail: *dockerEmail,
ECRHelper: ecrhelper.NewECRHelper(),
GCRHelper: gcrhelper.NewGCRHelper(),
}

members := grouper.Members{
Expand Down
185 changes: 185 additions & 0 deletions src/code.cloudfoundry.org/gcrhelper/fakes/fake_gcrhelper.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading