Set kube-apiserver as default logs container

Apply suggestions from code review

Co-authored-by: Peter Rifel <rifelpet@users.noreply.github.com>
This commit is contained in:
Ole Markus With 2021-09-01 20:48:47 +02:00
parent 6e792f776b
commit 18faee636f
7 changed files with 7 additions and 0 deletions

View File

@ -732,6 +732,7 @@ func (b *KubeAPIServerBuilder) buildPod(kubeAPIServer *kops.KubeAPIServerConfig)
func (b *KubeAPIServerBuilder) buildAnnotations() map[string]string {
annotations := make(map[string]string)
annotations["kubectl.kubernetes.io/default-container"] = "kube-apiserver"
if b.Cluster.Spec.API != nil {
if b.Cluster.Spec.API.LoadBalancer == nil || !b.Cluster.Spec.API.LoadBalancer.UseForInternalApi {

View File

@ -26,6 +26,7 @@ contents: |
annotations:
dns.alpha.kubernetes.io/external: api.minimal.example.com
dns.alpha.kubernetes.io/internal: api.internal.minimal.example.com
kubectl.kubernetes.io/default-container: kube-apiserver
scheduler.alpha.kubernetes.io/critical-pod: ""
creationTimestamp: null
labels:

View File

@ -5,6 +5,7 @@ contents: |
annotations:
dns.alpha.kubernetes.io/external: api.minimal.example.com
dns.alpha.kubernetes.io/internal: api.internal.minimal.example.com
kubectl.kubernetes.io/default-container: kube-apiserver
scheduler.alpha.kubernetes.io/critical-pod: ""
creationTimestamp: null
labels:

View File

@ -5,6 +5,7 @@ contents: |
annotations:
dns.alpha.kubernetes.io/external: api.minimal.example.com
dns.alpha.kubernetes.io/internal: api.internal.minimal.example.com
kubectl.kubernetes.io/default-container: kube-apiserver
scheduler.alpha.kubernetes.io/critical-pod: ""
creationTimestamp: null
labels:

View File

@ -5,6 +5,7 @@ contents: |
annotations:
dns.alpha.kubernetes.io/external: api.minimal.example.com
dns.alpha.kubernetes.io/internal: api.internal.minimal.example.com
kubectl.kubernetes.io/default-container: kube-apiserver
scheduler.alpha.kubernetes.io/critical-pod: ""
creationTimestamp: null
labels:

View File

@ -5,6 +5,7 @@ contents: |
annotations:
dns.alpha.kubernetes.io/external: api.minimal.example.com
dns.alpha.kubernetes.io/internal: api.internal.minimal.example.com
kubectl.kubernetes.io/default-container: kube-apiserver
scheduler.alpha.kubernetes.io/critical-pod: ""
creationTimestamp: null
labels:

View File

@ -5,6 +5,7 @@ contents: |
annotations:
dns.alpha.kubernetes.io/external: api.minimal.example.com
dns.alpha.kubernetes.io/internal: api.internal.minimal.example.com
kubectl.kubernetes.io/default-container: kube-apiserver
scheduler.alpha.kubernetes.io/critical-pod: ""
creationTimestamp: null
labels: