rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-21 03:18:38 +00:00
Code Issues Releases Wiki Activity

bump docker version 25.x.x & compatible code change

Browse Source
This commit is contained in:
Krunal Hingu
2025-05-09 13:54:31 +05:30
parent 5756a3837a
commit 75f3569eb9
7 changed files with 177 additions and 1062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/ecr.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ecr"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/registry"
v3 "github.com/rancher/rke/types"
)
@@ -21,7 +21,7 @@ const proxyEndpointScheme = "https://"
var ecrPattern = regexp.MustCompile(`(^[a-zA-Z0-9][a-zA-Z0-9-_]*)\.dkr\.ecr(\-fips)?\.([a-zA-Z0-9][a-zA-Z0-9-_]*)\.amazonaws\.com(\.cn)?`)
// ECRCredentialPlugin is a wrapper to generate ECR token using the AWS Credentials
func ECRCredentialPlugin(plugin *v3.ECRCredentialPlugin, pr string) (authConfig types.AuthConfig, err error) {
func ECRCredentialPlugin(plugin *v3.ECRCredentialPlugin, pr string) (authConfig registry.AuthConfig, err error) {
if plugin == nil {
err = fmt.Errorf("ECRCredentialPlugin: ECRCredentialPlugin called with nil plugin data")
return authConfig, err
@@ -78,7 +78,7 @@ func ECRCredentialPlugin(plugin *v3.ECRCredentialPlugin, pr string) (authConfig
return authConfig, err
}
func extractToken(token string) (authConfig types.AuthConfig, err error) {
func extractToken(token string) (authConfig registry.AuthConfig, err error) {
decodedToken, err := base64.StdEncoding.DecodeString(token)
if err != nil {
return authConfig, fmt.Errorf("Invalid token: %v", err)
@@ -89,7 +89,7 @@ func extractToken(token string) (authConfig types.AuthConfig, err error) {
return authConfig, fmt.Errorf("Invalid token: expected two parts, got %d", len(parts))
}
authConfig = types.AuthConfig{
authConfig = registry.AuthConfig{
Username: parts[0],
Password: parts[1],
}