linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 'linkerd identity'

This commit is contained in:
Alejandro Pedraza 2024-04-16 15:05:38 -05:00
parent 39db823fe0
commit 42dbdaddf5
No known key found for this signature in database
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/cmd/identity.go
View File

@ -161,7 +161,8 @@ func getContainerWithPort(pod corev1.Pod, portName string) (corev1.Container, er
return container, fmt.Errorf("pod not running: %s", pod.GetName()) return container, fmt.Errorf("pod not running: %s", pod.GetName())
} }
for _, c := range pod.Spec.Containers { containers := append(pod.Spec.InitContainers, pod.Spec.Containers...)
for _, c := range containers {
if c.Name != k8s.ProxyContainerName { if c.Name != k8s.ProxyContainerName {
continue continue
} }

3
pkg/k8s/k8s.go
View File

@ -239,7 +239,8 @@ func PodIdentity(pod *corev1.Pod) (string, error) {
podsa := pod.Spec.ServiceAccountName podsa := pod.Spec.ServiceAccountName
podns := pod.ObjectMeta.Namespace podns := pod.ObjectMeta.Namespace
for _, c := range pod.Spec.Containers { containers := append(pod.Spec.InitContainers, pod.Spec.Containers...)
for _, c := range containers {
if c.Name == ProxyContainerName { if c.Name == ProxyContainerName {
for _, env := range c.Env { for _, env := range c.Env {
if env.Name == "LINKERD2_PROXY_IDENTITY_LOCAL_NAME" { if env.Name == "LINKERD2_PROXY_IDENTITY_LOCAL_NAME" {