From e06c4d55a8b22a3e3dcc51b55facdff0eab365ac Mon Sep 17 00:00:00 2001 From: ryan-joynbio <88454121+ryan-joynbio@users.noreply.github.com> Date: Fri, 1 Oct 2021 08:54:57 -0700 Subject: [PATCH 1/3] Add error messages in aws-k8s-agent initialization --- cmd/aws-k8s-agent/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/aws-k8s-agent/main.go b/cmd/aws-k8s-agent/main.go index 4c80d189ed..7516d3d536 100644 --- a/cmd/aws-k8s-agent/main.go +++ b/cmd/aws-k8s-agent/main.go @@ -39,22 +39,24 @@ func _main() int { version.RegisterMetric() //Check API Server Connectivity - if k8sapi.CheckAPIServerConnectivity() != nil { + if err := k8sapi.CheckAPIServerConnectivity(); err != nil { + log.Errorf("Failed check API server connectivity: %s", err) return 1 } rawK8SClient, err := k8sapi.CreateKubeClient() if err != nil { + log.Errorf("Failed create kube client: %s", err) return 1 } cacheK8SClient, err := k8sapi.CreateCachedKubeClient(rawK8SClient) if err != nil { + log.Errorf("Failed create cached kube client: %s", err) return 1 } ipamContext, err := ipamd.New(rawK8SClient, cacheK8SClient) - if err != nil { log.Errorf("Initialization failure: %v", err) return 1 From 48596a886dee5e2fcd3369c7ad91b71da09b5845 Mon Sep 17 00:00:00 2001 From: ryan-joynbio <88454121+ryan-joynbio@users.noreply.github.com> Date: Wed, 20 Oct 2021 13:47:45 -0700 Subject: [PATCH 2/3] Update main.go --- cmd/aws-k8s-agent/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/aws-k8s-agent/main.go b/cmd/aws-k8s-agent/main.go index 7516d3d536..a37fb29dc3 100644 --- a/cmd/aws-k8s-agent/main.go +++ b/cmd/aws-k8s-agent/main.go @@ -46,13 +46,13 @@ func _main() int { rawK8SClient, err := k8sapi.CreateKubeClient() if err != nil { - log.Errorf("Failed create kube client: %s", err) + log.Errorf("Failed to create kube client: %s", err) return 1 } cacheK8SClient, err := k8sapi.CreateCachedKubeClient(rawK8SClient) if err != nil { - log.Errorf("Failed create cached kube client: %s", err) + log.Errorf("Failed to create cached kube client: %s", err) return 1 } From 2dd27155e4d9d5643b135612aa7dd0534306f92d Mon Sep 17 00:00:00 2001 From: ryan-joynbio <88454121+ryan-joynbio@users.noreply.github.com> Date: Wed, 20 Oct 2021 13:48:08 -0700 Subject: [PATCH 3/3] Update main.go --- cmd/aws-k8s-agent/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aws-k8s-agent/main.go b/cmd/aws-k8s-agent/main.go index a37fb29dc3..b69f7fab16 100644 --- a/cmd/aws-k8s-agent/main.go +++ b/cmd/aws-k8s-agent/main.go @@ -40,7 +40,7 @@ func _main() int { //Check API Server Connectivity if err := k8sapi.CheckAPIServerConnectivity(); err != nil { - log.Errorf("Failed check API server connectivity: %s", err) + log.Errorf("Failed to check API server connectivity: %s", err) return 1 }