Specify antrea-agent as the default container for kubectl cmds

antrea-io · Apr 9, 2021 · ada9da4 · ada9da4
1 parent cff53fa
commit ada9da4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 0 deletions.
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -2895,6 +2895,8 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  annotations:
+    kubectl.kubernetes.io/default-container: antrea-agent
   labels:
     app: antrea
     component: antrea-agent

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -2895,6 +2895,8 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  annotations:
+    kubectl.kubernetes.io/default-container: antrea-agent
   labels:
     app: antrea
     component: antrea-agent

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -2895,6 +2895,8 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  annotations:
+    kubectl.kubernetes.io/default-container: antrea-agent
   labels:
     app: antrea
     component: antrea-agent

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -2909,6 +2909,8 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  annotations:
+    kubectl.kubernetes.io/default-container: antrea-agent
   labels:
     app: antrea
     component: antrea-agent

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -2900,6 +2900,8 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  annotations:
+    kubectl.kubernetes.io/default-container: antrea-agent
   labels:
     app: antrea
     component: antrea-agent

diff --git a/build/yamls/base/agent.yml b/build/yamls/base/agent.yml
@@ -3,6 +3,10 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: antrea-agent
+  annotations:
+    # Starting with v1.21, Kubernetes supports default container annotation.
+    # Using "kubectl logs/exec/attach/cp" doesn't have to specify "-c antrea-agent" when troubleshooting.
+    kubectl.kubernetes.io/default-container: antrea-agent
   labels:
     component: antrea-agent
 spec: