address review comments

Signed-off-by: ChrsMark <[email protected]>

Author: ChrsMark

.chloggen/add_k8s_pod_ip.yaml

@@ -7,7 +7,7 @@ change_type: enhancement
 component: k8sattributesprocessor
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: "[processor/k8sattributes] Add support for exposing k8s.pod.ip metadata"
+note: "Add support for exposing k8s.pod.ip metadata"
 
 # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
 issues: [32960]

processor/k8sattributesprocessor/e2e_test.go

@@ -727,7 +727,7 @@ func TestE2E_MixRBAC(t *testing.T) {
 // While `k8s.pod.ip` is not set in `k8sattributes:extract:metadata` and the `pod_association` is not `connection`
 // we expect that the `k8s.pod.ip` metadata is not added.
 func TestE2E_NamespacedRBACNoPodIP(t *testing.T) {
-	testDir := filepath.Join("testdata", "e2e", "namespacedrbacnopodip")
+	testDir := filepath.Join("testdata", "e2e", "namespaced_rbac_no_pod_ip")
 
 	k8sClient, err := k8stest.NewK8sClient(testKubeConfig)
 	require.NoError(t, err)
@@ -932,6 +932,7 @@ func resourceHasAttributes(resource pcommon.Resource, kvs map[string]*expectedVa
 	for k, v := range kvs {
 		if v.mode != shouldnotexist {
 			foundAttrs[k] = false
+			continue
 		}
 		shouldNotFoundAttrs[k] = false
 	}

processor/k8sattributesprocessor/metadata.yaml

@@ -35,7 +35,7 @@ resource_attributes:
     type: string
     enabled: true
   k8s.pod.ip:
-    description: The IP of the Pod.
+    description: The IP address of the Pod.
     type: string
     enabled: false
   k8s.deployment.name:

processor/k8sattributesprocessor/options.go

@@ -21,8 +21,8 @@ const (
 	filterOPNotEquals    = "not-equals"
 	filterOPExists       = "exists"
 	filterOPDoesNotExist = "does-not-exist"
-	metadataPodStartTime = "k8s.pod.start_time"
 	metadataPodIP        = "k8s.pod.ip"
+	metadataPodStartTime = "k8s.pod.start_time"
 	specPodHostName      = "k8s.pod.hostname"
 	// TODO: use k8s.cluster.uid from semconv when available, and replace clusterUID with conventions.AttributeClusterUid
 	clusterUID = "k8s.cluster.uid"

processor/k8sattributesprocessor/testdata/e2e/namespacedrbacnopodip/collector/configmap.yaml renamed to processor/k8sattributesprocessor/testdata/e2e/namespaced_rbac_no_pod_ip/collector/configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Name }}-config
-  namespace: e2ek8sattribute-namespacedrbac
+  namespace: e2ek8sattribute-namespacedrbac-no-pod-ip
 data:
   relay: |
     exporters:
@@ -15,7 +15,7 @@ data:
     processors:
       k8sattributes:
         filter:
-          namespace: e2ek8sattribute-namespacedrbac
+          namespace: e2ek8sattribute-namespacedrbac-no-pod-ip
           node_from_env_var: MY_NODE_NAME
           labels:
           - key: component

processor/k8sattributesprocessor/testdata/e2e/namespacedrbacnopodip/collector/deployment.yaml renamed to processor/k8sattributesprocessor/testdata/e2e/namespaced_rbac_no_pod_ip/collector/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Name }}
-  namespace: e2ek8sattribute-namespacedrbac
+  namespace: e2ek8sattribute-namespacedrbac-no-pod-ip
 spec:
   replicas: 1
   selector:

processor/k8sattributesprocessor/testdata/e2e/namespacedrbacnopodip/collector/role.yaml renamed to processor/k8sattributesprocessor/testdata/e2e/namespaced_rbac_no_pod_ip/collector/role.yaml

@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ .Name }}
-  namespace: e2ek8sattribute-namespacedrbac
+  namespace: e2ek8sattribute-namespacedrbac-no-pod-ip
 rules:
   - apiGroups: [""]
     resources: ["pods"]

processor/k8sattributesprocessor/testdata/e2e/namespacedrbacnopodip/collector/rolebinding.yaml renamed to processor/k8sattributesprocessor/testdata/e2e/namespaced_rbac_no_pod_ip/collector/rolebinding.yaml

@@ -2,12 +2,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ .Name }}
-  namespace: e2ek8sattribute-namespacedrbac
+  namespace: e2ek8sattribute-namespacedrbac-no-pod-ip
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ .Name }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Name }}
-    namespace: e2ek8sattribute-namespacedrbac
+    namespace: e2ek8sattribute-namespacedrbac-no-pod-ip

processor/k8sattributesprocessor/testdata/e2e/namespacedrbacnopodip/collector/service.yaml renamed to processor/k8sattributesprocessor/testdata/e2e/namespaced_rbac_no_pod_ip/collector/service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Name }}
-  namespace: e2ek8sattribute-namespacedrbac
+  namespace: e2ek8sattribute-namespacedrbac-no-pod-ip
 spec:
   type: ClusterIP
   ports:

processor/k8sattributesprocessor/testdata/e2e/namespacedrbacnopodip/collector/serviceaccount.yaml renamed to processor/k8sattributesprocessor/testdata/e2e/namespaced_rbac_no_pod_ip/collector/serviceaccount.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Name }}
-  namespace: e2ek8sattribute-namespacedrbac
+  namespace: e2ek8sattribute-namespacedrbac-no-pod-ip