Merge pull request #17 from spreadshirt/fix-default-container

Select the default container if one exists
spreadshirt · May 12, 2023 · f21c143 · f21c143
2 parents 2277e54 + db5802b
commit f21c143
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/cmd/kubectl-request/kubectl-request.go b/cmd/kubectl-request/kubectl-request.go
@@ -202,12 +202,17 @@ func (ac *accessCommand) Request(cmd *cobra.Command, args []string) error {
 
 	}
 
-	// default to first container if none is set (like `kubectl exec`)
+	// default to default or first container if none is set (like `kubectl exec`)
 	if ac.execOptions.Container == "" {
 		if len(selectedPod.Spec.Containers) == 0 {
 			return fmt.Errorf("no containers in pod %q", selectedPod.Name)
 		}
-		ac.execOptions.Container = selectedPod.Spec.Containers[0].Name
+
+		if selectedPod.ObjectMeta.Annotations["kubectl.kubernetes.io/default-container"] != "" {
+			ac.execOptions.Container = selectedPod.ObjectMeta.Annotations["kubectl.kubernetes.io/default-container"]
+		} else {
+			ac.execOptions.Container = selectedPod.Spec.Containers[0].Name
+		}
 	}
 
 	accessRequestsClient, err := accessrequestsclientv1.NewForConfig(config)

diff --git a/dev/nginx-deployment.yaml b/dev/nginx-deployment.yaml
@@ -11,11 +11,20 @@ spec:
       app: nginx
   template:
     metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: nginx
       labels:
         app: nginx
     spec:
       containers:
+      # sleeps forever, used to test that default-container annotations is respected
+      - name: sleeper
+        image: busybox
+        command:
+        - /bin/sh
+        - -c
+        - 'sleep infinity'
       - name: nginx
         image: nginx:1.14.2
         ports:
-        - containerPort: 80
+        - containerPort: 80