Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

log for DelNetworkReply now differentiates between IPv4 and IPv6 addr… #2742

Merged
merged 1 commit into from
Jan 5, 2024
Merged

log for DelNetworkReply now differentiates between IPv4 and IPv6 addr… #2742

merged 1 commit into from
Jan 5, 2024

Conversation

zachdorame
Copy link
Contributor

What type of PR is this?

bug

Which issue does this PR fix:
#2741

What does this PR do / Why do we need it:
Fixes log statement for DelNetworkReply to differentiate between IPv4 and IPv6 addresses. Also added punctuation to AddNetworkReply log statement so that both logging statements follow a similar format

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
N/A

Testing done on this change:

Below are ipamd.log logs showing the modified log statements

{"level":"debug","ts":"2024-01-04T23:57:49.484Z","caller":"rpc/rpc.pb.go:713","msg":"VPC V6 CIDR 2600:1f14:324e:1700::/56"}
{"level":"info","ts":"2024-01-04T23:57:49.484Z","caller":"rpc/rpc.pb.go:713","msg":"Send AddNetworkReply: IPv4Addr: , IPv6Addr: 2600:1f14:324e:1700:22df::1, DeviceNumber: 0, err: <nil>"}
{"level":"info","ts":"2024-01-04T23:57:58.316Z","caller":"rpc/rpc.pb.go:731","msg":"Received DelNetwork for Sandbox 65edae24ac84421bf117c5d1138b62b758c66b2d606da033caf60ca3c880d448"}
{"level":"debug","ts":"2024-01-04T23:57:58.316Z","caller":"rpc/rpc.pb.go:731","msg":"DelNetworkRequest: K8S_POD_NAME:\"nginx-deployment-cd5968d5b-cq8vq\" K8S_POD_NAMESPACE:\"default\" K8S_POD_INFRA_CONTAINER_ID:\"65edae24ac84421bf117c5d1138b62b758c66b2d606da033caf60ca3c880d448\" Reason:\"PodDeleted\" ContainerID:\"65edae24ac84421bf117c5d1138b62b758c66b2d606da033caf60ca3c880d448\" IfName:\"eth0\" NetworkName:\"aws-cni\""}
{"level":"debug","ts":"2024-01-04T23:57:58.316Z","caller":"ipamd/rpc_handler.go:260","msg":"UnassignPodIPAddress: IP address pool stats: total 281474976710656, assigned 2, sandbox aws-cni/65edae24ac84421bf117c5d1138b62b758c66b2d606da033caf60ca3c880d448/eth0"}
{"level":"info","ts":"2024-01-04T23:57:58.316Z","caller":"datastore/data_store.go:1111","msg":"unassignPodIPAddressUnsafe: Unassign IP 2600:1f14:324e:1700:22df::1 from sandbox aws-cni/65edae24ac84421bf117c5d1138b62b758c66b2d606da033caf60ca3c880d448/eth0"}{"level":"info","ts":"2024-01-04T23:57:58.317Z","caller":"ipamd/rpc_handler.go:260","msg":"UnassignPodIPAddress: sandbox aws-cni/65edae24ac84421bf117c5d1138b62b758c66b2d606da033caf60ca3c880d448/eth0's ipAddr 2600:1f14:324e:1700:22df::1, DeviceNumber 0"}
{"level":"info","ts":"2024-01-04T23:57:58.317Z","caller":"rpc/rpc.pb.go:731","msg":"Send DelNetworkReply: IPv4Addr: , IPv6Addr: 2600:1f14:324e:1700:22df::1, DeviceNumber: 0, err: <nil>"}

Will this PR introduce any new dependencies?:

No
Will this break upgrades or downgrades? Has updating a running cluster been tested?:
N/A

Does this change require updates to the CNI daemonset config files to work?:

No
Does this PR introduce any user-facing change?:

No

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@zachdorame zachdorame requested a review from a team as a code owner January 5, 2024 00:15
@zachdorame zachdorame merged commit 3c20f2b into aws:master Jan 5, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants