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

operator/cmd: Move Cilium Operator version log earlier #25018

Merged
merged 1 commit into from Apr 25, 2023

Conversation

christarazi
Copy link
Member

To be consistent with where the version log is printed in the Agent,
move the Operator's log statement accordingly to be after the options
are printed.

This is a very minor change, but I found it much easier to find the
version when it's in the usual spot that we are used to when looking
at the Agent. Without this change, the version is printed after the hive
framework initialization. If that fails, we wouldn't be able to see the
version log anyway.

Signed-off-by: Chris Tarazi chris@isovalent.com

To be consistent with where the version log is printed in the Agent,
move the Operator's log statement accordingly to be after the options
are printed.

This is a very minor change, but I found it much easier to find the
version when it's in the usual spot that we are used to when looking
at the Agent. Without this change, the version is printed after the hive
framework initialization. If that fails, we wouldn't be able to see the
version log anyway.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi added kind/cleanup This includes no functional changes. area/operator Impacts the cilium-operator component release-note/misc This PR makes changes that have no direct user impact. sig/agent Cilium agent related. labels Apr 20, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 20, 2023
@christarazi christarazi marked this pull request as ready for review April 20, 2023 18:49
@christarazi christarazi requested a review from a team as a code owner April 20, 2023 18:49
@christarazi
Copy link
Member Author

christarazi commented Apr 20, 2023

/test

Job 'Cilium-PR-K8s-1.16-kernel-4.19' failed:

Click to show.

Test Name

K8sAgentHubbleTest Hubble Observe Test L3/L4 Flow

Failure Output

FAIL: hubble observe query timed out on "Exitcode: 0 \nStdout:\n \t {\"flow\":{\"time\":\"2023-04-20T20:21:15.653707777Z\",\"verdict\":\"FORWARDED\",\"ethernet\":{\"source\":\"ca:47:d0:56:4d:b3\",\"destination\":\"36:52:b0:81:06:a6\"},\"IP\":{\"source\":\"10.0.1.49\",\"destination\":\"10.0.1.173\",\"ipVersion\":\"IPv4\"},\"l4\":{\"TCP\":{\"source_port\":60870,\"destination_port\":80,\"flags\":{\"SYN\":true}}},\"source\":{\"ID\":174,\"identity\":7471,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:appSecond=true\",\"k8s:id=app2\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app2-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app2-6dfff7bfbd-djx8s\",\"workloads\":[{\"name\":\"app2\",\"kind\":\"Deployment\"}]},\"destination\":{\"ID\":3994,\"identity\":19661,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:id=app1\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app1-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app1-755788dd65-lxq77\",\"workloads\":[{\"name\":\"app1\",\"kind\":\"Deployment\"}]},\"Type\":\"L3_L4\",\"node_name\":\"k8s1\",\"event_type\":{\"type\":4},\"traffic_direction\":\"INGRESS\",\"trace_observation_point\":\"TO_ENDPOINT\",\"is_reply\":false,\"interface\":{\"index\":26},\"Summary\":\"TCP Flags: SYN\"},\"node_name\":\"k8s1\",\"time\":\"2023-04-20T20:21:15.653707777Z\"}\n\t {\"flow\":{\"time\":\"2023-04-20T20:21:15.653722598Z\",\"verdict\":\"FORWARDED\",\"ethernet\":{\"source\":\"ca:47:d0:56:4d:b3\",\"destination\":\"36:52:b0:81:06:a6\"},\"IP\":{\"source\":\"10.0.1.49\",\"destination\":\"10.0.1.173\",\"ipVersion\":\"IPv4\"},\"l4\":{\"TCP\":{\"source_port\":60870,\"destination_port\":80,\"flags\":{\"ACK\":true}}},\"source\":{\"ID\":174,\"identity\":7471,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:appSecond=true\",\"k8s:id=app2\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app2-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app2-6dfff7bfbd-djx8s\",\"workloads\":[{\"name\":\"app2\",\"kind\":\"Deployment\"}]},\"destination\":{\"ID\":3994,\"identity\":19661,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:id=app1\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app1-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app1-755788dd65-lxq77\",\"workloads\":[{\"name\":\"app1\",\"kind\":\"Deployment\"}]},\"Type\":\"L3_L4\",\"node_name\":\"k8s1\",\"event_type\":{\"type\":4},\"traffic_direction\":\"INGRESS\",\"trace_observation_point\":\"TO_ENDPOINT\",\"is_reply\":false,\"interface\":{\"index\":26},\"Summary\":\"TCP Flags: ACK\"},\"node_name\":\"k8s1\",\"time\":\"2023-04-20T20:21:15.653722598Z\"}\n\t {\"flow\":{\"time\":\"2023-04-20T20:21:15.654641146Z\",\"verdict\":\"FORWARDED\",\"ethernet\":{\"source\":\"ca:47:d0:56:4d:b3\",\"destination\":\"36:52:b0:81:06:a6\"},\"IP\":{\"source\":\"10.0.1.49\",\"destination\":\"10.0.1.173\",\"ipVersion\":\"IPv4\"},\"l4\":{\"TCP\":{\"source_port\":60870,\"destination_port\":80,\"flags\":{\"PSH\":true,\"ACK\":true}}},\"source\":{\"ID\":174,\"identity\":7471,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:appSecond=true\",\"k8s:id=app2\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app2-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app2-6dfff7bfbd-djx8s\",\"workloads\":[{\"name\":\"app2\",\"kind\":\"Deployment\"}]},\"destination\":{\"ID\":3994,\"identity\":19661,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:id=app1\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app1-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app1-755788dd65-lxq77\",\"workloads\":[{\"name\":\"app1\",\"kind\":\"Deployment\"}]},\"Type\":\"L3_L4\",\"node_name\":\"k8s1\",\"event_type\":{\"type\":4},\"traffic_direction\":\"INGRESS\",\"trace_observation_point\":\"TO_ENDPOINT\",\"is_reply\":false,\"interface\":{\"index\":26},\"Summary\":\"TCP Flags: ACK, PSH\"},\"node_name\":\"k8s1\",\"time\":\"2023-04-20T20:21:15.654641146Z\"}\n\t {\"flow\":{\"time\":\"2023-04-20T20:21:15.654659891Z\",\"verdict\":\"FORWARDED\",\"ethernet\":{\"source\":\"ca:47:d0:56:4d:b3\",\"destination\":\"36:52:b0:81:06:a6\"},\"IP\":{\"source\":\"10.0.1.49\",\"destination\":\"10.0.1.173\",\"ipVersion\":\"IPv4\"},\"l4\":{\"TCP\":{\"source_port\":60870,\"destination_port\":80,\"flags\":{\"ACK\":true}}},\"source\":{\"ID\":174,\"identity\":7471,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:appSecond=true\",\"k8s:id=app2\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app2-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app2-6dfff7bfbd-djx8s\",\"workloads\":[{\"name\":\"app2\",\"kind\":\"Deployment\"}]},\"destination\":{\"ID\":3994,\"identity\":19661,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:id=app1\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app1-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app1-755788dd65-lxq77\",\"workloads\":[{\"name\":\"app1\",\"kind\":\"Deployment\"}]},\"Type\":\"L3_L4\",\"node_name\":\"k8s1\",\"event_type\":{\"type\":4},\"traffic_direction\":\"INGRESS\",\"trace_observation_point\":\"TO_ENDPOINT\",\"is_reply\":false,\"interface\":{\"index\":26},\"Summary\":\"TCP Flags: ACK\"},\"node_name\":\"k8s1\",\"time\":\"2023-04-20T20:21:15.654659891Z\"}\n\t {\"flow\":{\"time\":\"2023-04-20T20:21:15.655084625Z\",\"verdict\":\"FORWARDED\",\"ethernet\":{\"source\":\"ca:47:d0:56:4d:b3\",\"destination\":\"36:52:b0:81:06:a6\"},\"IP\":{\"source\":\"10.0.1.49\",\"destination\":\"10.0.1.173\",\"ipVersion\":\"IPv4\"},\"l4\":{\"TCP\":{\"source_port\":60870,\"destination_port\":80,\"flags\":{\"FIN\":true,\"ACK\":true}}},\"source\":{\"ID\":174,\"identity\":7471,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:appSecond=true\",\"k8s:id=app2\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app2-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app2-6dfff7bfbd-djx8s\",\"workloads\":[{\"name\":\"app2\",\"kind\":\"Deployment\"}]},\"destination\":{\"ID\":3994,\"identity\":19661,\"namespace\":\"202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"labels\":[\"k8s:id=app1\",\"k8s:io.cilium.k8s.policy.cluster=default\",\"k8s:io.cilium.k8s.policy.serviceaccount=app1-account\",\"k8s:io.kubernetes.pod.namespace=202304202021k8sagenthubbletesthubbleobservetestl3l4flow\",\"k8s:zgroup=testapp\"],\"pod_name\":\"app1-755788dd65-lxq77\",\"workloads\":[{\"name\":\"app1\",\"kind\":\"Deployment\"}]},\"Type\":\"L3_L4\",\"node_name\":\"k8s1\",\"event_type\":{\"type\":4},\"traffic_direction\":\"INGRESS\",\"trace_observation_point\":\"TO_ENDPOINT\",\"is_reply\":false,\"interface\":{\"index\":26},\"Summary\":\"TCP Flags: ACK, FIN\"},\"node_name\":\"k8s1\",\"time\":\"2023-04-20T20:21:15.655084625Z\"}\n\t \nStderr:\n \t \n"

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.16-kernel-4.19/1028/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.16-kernel-4.19 so I can create one.

Job 'Cilium-PR-K8s-1.27-kernel-net-next' failed:

Click to show.

Test Name

K8sDatapathConfig Host firewall With VXLAN and endpoint routes

Failure Output

FAIL: Failed to reach 192.168.56.11:80 from testclient-host-4rtdn

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.27-kernel-net-next/48/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.27-kernel-net-next so I can create one.


Edit:

@pchaigno pchaigno added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Apr 21, 2023
@christarazi
Copy link
Member Author

christarazi commented Apr 23, 2023

/mlh new-flake Cilium-PR-K8s-1.16-kernel-4.19

👍 created #25068

@christarazi
Copy link
Member Author

/test-1.16-4.19

@christarazi
Copy link
Member Author

/test-1.27-net-next

@christarazi christarazi requested review from joamaki and removed request for joamaki April 24, 2023 17:05
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 25, 2023
@pchaigno pchaigno merged commit a8e4873 into cilium:main Apr 25, 2023
57 checks passed
@christarazi christarazi deleted the pr/christarazi/operator-version branch April 25, 2023 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/operator Impacts the cilium-operator component kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact. sig/agent Cilium agent related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants