[8.0](backport #28675) Update standalone agent manifest conditions an…

…d scheduler and controllermanager default hosts (#28765) * Update standalone agent manifest conditions and scheduler and controllermanager default hosts (#28675)
elastic · Nov 3, 2021 · c41fc8d · c41fc8d
1 parent 523cfb9
commit c41fc8d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -258,6 +258,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Update cloud.google.com/go library. {pull}28229[28229]
 - Add additional metadata to the root HTTP endpoint. {pull}28265[28265]
 - Upgrade k8s.io/client-go library. {pull}28228[28228]
+- Update kubernetes scheduler and controllermanager endpoints in elastic-agent-standalone-kubernetes.yaml with secure ports {pull}28675[28675]
 
 *Auditbeat*
 

diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
@@ -341,19 +341,23 @@ data:
               type: metrics
             metricsets:
               - controllermanager
+            bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
             hosts:
-              - '${kubernetes.pod.ip}:10252'
+              - 'https://${kubernetes.pod.ip}:10257'
             period: 10s
-            condition: ${kubernetes.pod.labels.component} == 'kube-controller-manager'
+            ssl.verification_mode: none
+            condition: ${kubernetes.labels.component} == 'kube-controller-manager'
           - data_stream:
               dataset: kubernetes.scheduler
               type: metrics
             metricsets:
               - scheduler
+            bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
             hosts:
-              - '${kubernetes.pod.ip}:10251'
+              - 'https://${kubernetes.pod.ip}:10259'
             period: 10s
-            condition: ${kubernetes.pod.labels.component} == 'kube-scheduler'
+            ssl.verification_mode: none
+            condition: ${kubernetes.labels.component} == 'kube-scheduler'
           - data_stream:
               dataset: kubernetes.proxy
               type: metrics

diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
@@ -341,19 +341,23 @@ data:
               type: metrics
             metricsets:
               - controllermanager
+            bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
             hosts:
-              - '${kubernetes.pod.ip}:10252'
+              - 'https://${kubernetes.pod.ip}:10257'
             period: 10s
-            condition: ${kubernetes.pod.labels.component} == 'kube-controller-manager'
+            ssl.verification_mode: none
+            condition: ${kubernetes.labels.component} == 'kube-controller-manager'
           - data_stream:
               dataset: kubernetes.scheduler
               type: metrics
             metricsets:
               - scheduler
+            bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
             hosts:
-              - '${kubernetes.pod.ip}:10251'
+              - 'https://${kubernetes.pod.ip}:10259'
             period: 10s
-            condition: ${kubernetes.pod.labels.component} == 'kube-scheduler'
+            ssl.verification_mode: none
+            condition: ${kubernetes.labels.component} == 'kube-scheduler'
           - data_stream:
               dataset: kubernetes.proxy
               type: metrics