github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72219 from micahhausler/aws-user-agent 

Added kubernetes version to user-agent for AWS SDK calls
pull/564/head
Kubernetes Prow Robot 2018-12-21 03:50:38 -08:00 committed by GitHub
parent d257ee9bfd 949d5f97c4
commit 870c050727
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cloudprovider/providers/aws/BUILD
View File

@ -31,6 +31,7 @@ go_library(
"//pkg/controller:go_default_library", "//pkg/controller:go_default_library",
"//pkg/credentialprovider/aws:go_default_library", "//pkg/credentialprovider/aws:go_default_library",
"//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis:go_default_library",
"//pkg/version:go_default_library",
"//pkg/volume:go_default_library", "//pkg/volume:go_default_library",
"//pkg/volume/util:go_default_library", "//pkg/volume/util:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",

6
pkg/cloudprovider/providers/aws/aws.go
View File

@ -59,6 +59,7 @@ import (
"k8s.io/kubernetes/pkg/api/v1/service" "k8s.io/kubernetes/pkg/api/v1/service"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
"k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
volumeutil "k8s.io/kubernetes/pkg/volume/util" volumeutil "k8s.io/kubernetes/pkg/volume/util"
) )
@ -592,6 +593,11 @@ func newAWSSDKProvider(creds *credentials.Credentials) *awsSDKProvider {
} }
func (p *awsSDKProvider) addHandlers(regionName string, h *request.Handlers) { func (p *awsSDKProvider) addHandlers(regionName string, h *request.Handlers) {
h.Build.PushFrontNamed(request.NamedHandler{
Name: "k8s/user-agent",
Fn: request.MakeAddToUserAgentHandler("kubernetes", version.Get().String()),
})
h.Sign.PushFrontNamed(request.NamedHandler{ h.Sign.PushFrontNamed(request.NamedHandler{
Name: "k8s/logger", Name: "k8s/logger",
Fn: awsHandlerLogger, Fn: awsHandlerLogger,

1
pkg/credentialprovider/aws/BUILD
View File

@ -12,6 +12,7 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/credentialprovider/aws", importpath = "k8s.io/kubernetes/pkg/credentialprovider/aws",
deps = [ deps = [
"//pkg/credentialprovider:go_default_library", "//pkg/credentialprovider:go_default_library",
"//pkg/version:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library",

5
pkg/credentialprovider/aws/aws_credentials.go
View File

@ -29,6 +29,7 @@ import (
"k8s.io/klog" "k8s.io/klog"
"k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/credentialprovider"
"k8s.io/kubernetes/pkg/version"
) )
const awsChinaRegionPrefix = "cn-" const awsChinaRegionPrefix = "cn-"
@ -169,6 +170,10 @@ func (p *ecrProvider) Enabled() bool {
Credentials: nil, Credentials: nil,
Region: &p.region, Region: &p.region,
}))} }))}
getter.svc.Handlers.Build.PushFrontNamed(request.NamedHandler{
Name: "k8s/user-agent",
Fn: request.MakeAddToUserAgentHandler("kubernetes", version.Get().String()),
})
getter.svc.Handlers.Sign.PushFrontNamed(request.NamedHandler{ getter.svc.Handlers.Sign.PushFrontNamed(request.NamedHandler{
Name: "k8s/logger", Name: "k8s/logger",
Fn: awsHandlerLogger, Fn: awsHandlerLogger,