scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reword the event message to read better for a single secret

Browse Source 
Co-authored-by: Steven E. Harris <seh@panix.com>
This commit is contained in:
Tomas Tormo
2023-05-18 15:43:59 +02:00
committed by Tomas Tormo
parent 5a75a03a77
commit a10ff53d8e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet_pods.go
View File

@@ -895,7 +895,7 @@ func (kl *Kubelet) getPullSecretsForPod(pod *v1.Pod) []v1.Secret {
} }
if len(failedPullSecrets) > 0 { if len(failedPullSecrets) > 0 {
kl.recorder.Eventf(pod, v1.EventTypeWarning, "FailedToRetrieveImagePullSecret", "Unable to retrieve image pull secrets %s; attempting to pull the image may not succeed.", strings.Join(failedPullSecrets, ", ")) kl.recorder.Eventf(pod, v1.EventTypeWarning, "FailedToRetrieveImagePullSecret", "Unable to retrieve some image pull secrets (%s); attempting to pull the image may not succeed.", strings.Join(failedPullSecrets, ", "))
} }
return pullSecrets return pullSecrets

3
pkg/kubelet/kubelet_pods_test.go
View File

@@ -5406,7 +5406,8 @@ func TestGetNonExistentImagePullSecret(t *testing.T) {
testKubelet.kubelet.secretManager = secret.NewFakeManagerWithSecrets(secrets) testKubelet.kubelet.secretManager = secret.NewFakeManagerWithSecrets(secrets)
defer testKubelet.Cleanup() defer testKubelet.Cleanup()
expectedEvent := "Warning FailedToRetrieveImagePullSecret Unable to retrieve image pull secrets secretFoo; attempting to pull the image may not succeed." expectedEvent := "Warning FailedToRetrieveImagePullSecret Unable to retrieve some image pull secrets (secretFoo); attempting to pull the image may not succeed."
testPod := &v1.Pod{ testPod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Namespace: "nsFoo", Namespace: "nsFoo",