diff --git a/deploy/helm/elastic-agent/Chart.lock b/deploy/helm/elastic-agent/Chart.lock index 368d848c4fc..923b24ba490 100644 --- a/deploy/helm/elastic-agent/Chart.lock +++ b/deploy/helm/elastic-agent/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: kube-state-metrics repository: https://prometheus-community.github.io/helm-charts - version: 5.30.1 -digest: sha256:890f386cd7edf510a8d3370f0450012e814305bf6f74dfac8d005d1774a81112 -generated: "2025-03-06T16:14:13.42839+02:00" + version: 6.1.0 +digest: sha256:6db27b4d43ee833b5b031d906b060c654ce473effc9874145ec7df8735e13df8 +generated: "2025-07-29T10:49:56.147143+03:00" diff --git a/deploy/helm/elastic-agent/Chart.yaml b/deploy/helm/elastic-agent/Chart.yaml index 1e3c97ea8ea..6a9ae86bbf5 100644 --- a/deploy/helm/elastic-agent/Chart.yaml +++ b/deploy/helm/elastic-agent/Chart.yaml @@ -7,6 +7,6 @@ appVersion: 8.19.0 version: 8.19.0-beta dependencies: - name: kube-state-metrics - version: "5.30.1" + version: "6.1.0" repository: https://prometheus-community.github.io/helm-charts condition: kube-state-metrics.enabled diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/Chart.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/Chart.yaml index cb98805b66f..ff67a27914d 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/Chart.yaml +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/Chart.yaml @@ -4,7 +4,7 @@ annotations: - name: Chart Source url: https://github.com/prometheus-community/helm-charts apiVersion: v2 -appVersion: 2.15.0 +appVersion: 2.16.0 description: Install kube-state-metrics to generate and expose cluster-level metrics home: https://github.com/kubernetes/kube-state-metrics/ keywords: @@ -26,4 +26,4 @@ name: kube-state-metrics sources: - https://github.com/kubernetes/kube-state-metrics/ type: application -version: 5.30.1 +version: 6.1.0 diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/README.md b/deploy/helm/elastic-agent/charts/kube-state-metrics/README.md index 843be89e69f..208e1c47013 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/README.md +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/README.md @@ -47,6 +47,10 @@ You can upgrade in-place: 1. [get repository info](#get-repository-info) 1. [upgrade](#upgrading-chart) your existing release name using the new chart repository +## Upgrading to v6.0.0 + +This version drops support for deprecated Pod Security Policy resources. + ## Upgrading to v3.0.0 v3.0.0 includes kube-state-metrics v2.0, see the [changelog](https://github.com/kubernetes/kube-state-metrics/blob/release-2.0/CHANGELOG.md) for major changes on the application-side. diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/_helpers.tpl b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/_helpers.tpl index 3dd326da4ec..c8cfa56b6d8 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/_helpers.tpl +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/_helpers.tpl @@ -104,6 +104,25 @@ labelValueLengthLimit: {{ . }} {{- end }} {{- end -}} +{{/* Sets default scrape limits for scrapeconfig */}} +{{- define "scrapeconfig.scrapeLimits" -}} +{{- with .sampleLimit }} +sampleLimit: {{ . }} +{{- end }} +{{- with .targetLimit }} +targetLimit: {{ . }} +{{- end }} +{{- with .labelLimit }} +labelLimit: {{ . }} +{{- end }} +{{- with .labelNameLengthLimit }} +labelNameLengthLimit: {{ . }} +{{- end }} +{{- with .labelValueLengthLimit }} +labelValueLengthLimit: {{ . }} +{{- end }} +{{- end -}} + {{/* Formats imagePullSecrets. Input is (dict "Values" .Values "imagePullSecrets" .{specific imagePullSecrets}) */}} @@ -154,3 +173,14 @@ The image to use for kubeRBACProxy {{- end }} {{- end }} {{- end }} + +{{/* +The name of the ConfigMap for the customResourceState config. +*/}} +{{- define "kube-state-metrics.crsConfigMapName" -}} + {{- if ne .Values.customResourceState.name "" }} + {{- .Values.customResourceState.name }} + {{- else }} + {{- template "kube-state-metrics.fullname" . }}-customresourcestate-config + {{- end }} +{{- end }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/crs-configmap.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/crs-configmap.yaml index d38a75a51df..e64c4a7b813 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/crs-configmap.yaml +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/crs-configmap.yaml @@ -1,8 +1,8 @@ -{{- if .Values.customResourceState.enabled}} +{{- if and .Values.customResourceState.enabled .Values.customResourceState.create }} apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "kube-state-metrics.fullname" . }}-customresourcestate-config + name: {{ template "kube-state-metrics.crsConfigMapName" . }} namespace: {{ template "kube-state-metrics.namespace" . }} labels: {{- include "kube-state-metrics.labels" . | indent 4 }} @@ -11,6 +11,6 @@ metadata: {{ toYaml .Values.annotations | nindent 4 }} {{- end }} data: - config.yaml: | + {{ .Values.customResourceState.key }}: | {{- toYaml .Values.customResourceState.config | nindent 4 }} {{- end }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/deployment.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/deployment.yaml index 936640857bd..e50d3adddcc 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/deployment.yaml +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/deployment.yaml @@ -9,9 +9,12 @@ metadata: namespace: {{ template "kube-state-metrics.namespace" . }} labels: {{- include "kube-state-metrics.labels" . | indent 4 }} - {{- if .Values.annotations }} + {{- with .Values.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.annotations }} annotations: -{{ toYaml .Values.annotations | indent 4 }} + {{- toYaml . | nindent 4 }} {{- end }} spec: selector: @@ -52,6 +55,10 @@ spec: initContainers: {{- toYaml . | nindent 6 }} {{- end }} + {{- if .Values.dnsConfig }} + dnsConfig: {{ toYaml .Values.dnsConfig | nindent 8 }} + {{- end }} + dnsPolicy: {{ .Values.dnsPolicy }} containers: {{- $servicePort := ternary 9090 (.Values.service.port | default 8080) .Values.kubeRBACProxy.enabled}} {{- $telemetryPort := ternary 9091 (.Values.selfMonitor.telemetryPort | default 8081) .Values.kubeRBACProxy.enabled}} @@ -132,7 +139,7 @@ spec: {{- end }} {{- end }} {{- if .Values.customResourceState.enabled }} - - --custom-resource-state-config-file=/etc/customresourcestate/config.yaml + - --custom-resource-state-config-file=/etc/customresourcestate/{{ .Values.customResourceState.key }} {{- end }} {{- if or (.Values.kubeconfig.enabled) (.Values.customResourceState.enabled) (.Values.volumeMounts) }} volumeMounts: @@ -161,6 +168,7 @@ spec: name: "metrics" {{- end }} {{- end }} + {{- if not .Values.kubeRBACProxy.enabled }} {{- if .Values.startupProbe.enabled }} startupProbe: failureThreshold: {{ .Values.startupProbe.failureThreshold }} @@ -232,6 +240,7 @@ spec: periodSeconds: {{ .Values.readinessProbe.periodSeconds }} successThreshold: {{ .Values.readinessProbe.successThreshold }} timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + {{- end }} resources: {{ toYaml .Values.resources | indent 10 }} {{- if .Values.containerSecurityContext }} @@ -358,7 +367,7 @@ spec: {{- if .Values.customResourceState.enabled}} - name: customresourcestate-config configMap: - name: {{ template "kube-state-metrics.fullname" . }}-customresourcestate-config + name: {{ template "kube-state-metrics.crsConfigMapName" . }} {{- end }} {{- if .Values.volumes }} {{ toYaml .Values.volumes | indent 8 }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/pdb.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/pdb.yaml index 3771b511de0..2d1e64b2b09 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/pdb.yaml +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/pdb.yaml @@ -1,9 +1,5 @@ {{- if .Values.podDisruptionBudget -}} -{{ if $.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}} apiVersion: policy/v1 -{{- else -}} -apiVersion: policy/v1beta1 -{{- end }} kind: PodDisruptionBudget metadata: name: {{ template "kube-state-metrics.fullname" . }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/podsecuritypolicy.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/podsecuritypolicy.yaml deleted file mode 100644 index 8905e113e84..00000000000 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/podsecuritypolicy.yaml +++ /dev/null @@ -1,39 +0,0 @@ -{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: {{ template "kube-state-metrics.fullname" . }} - labels: - {{- include "kube-state-metrics.labels" . | indent 4 }} -{{- if .Values.podSecurityPolicy.annotations }} - annotations: -{{ toYaml .Values.podSecurityPolicy.annotations | indent 4 }} -{{- end }} -spec: - privileged: false - volumes: - - 'secret' -{{- if .Values.podSecurityPolicy.additionalVolumes }} -{{ toYaml .Values.podSecurityPolicy.additionalVolumes | indent 4 }} -{{- end }} - hostNetwork: false - hostIPC: false - hostPID: false - runAsUser: - rule: 'MustRunAsNonRoot' - seLinux: - rule: 'RunAsAny' - supplementalGroups: - rule: 'MustRunAs' - ranges: - # Forbid adding the root group. - - min: 1 - max: 65535 - fsGroup: - rule: 'MustRunAs' - ranges: - # Forbid adding the root group. - - min: 1 - max: 65535 - readOnlyRootFilesystem: false -{{- end }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrole.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrole.yaml deleted file mode 100644 index 654e4a3d57f..00000000000 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrole.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: - {{- include "kube-state-metrics.labels" . | indent 4 }} - name: psp-{{ template "kube-state-metrics.fullname" . }} -rules: -{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} -{{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }} -- apiGroups: ['policy'] -{{- else }} -- apiGroups: ['extensions'] -{{- end }} - resources: ['podsecuritypolicies'] - verbs: ['use'] - resourceNames: - - {{ template "kube-state-metrics.fullname" . }} -{{- end }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml deleted file mode 100644 index 5b62a18bdf1..00000000000 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - labels: - {{- include "kube-state-metrics.labels" . | indent 4 }} - name: psp-{{ template "kube-state-metrics.fullname" . }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: psp-{{ template "kube-state-metrics.fullname" . }} -subjects: - - kind: ServiceAccount - name: {{ template "kube-state-metrics.serviceAccountName" . }} - namespace: {{ template "kube-state-metrics.namespace" . }} -{{- end }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/role.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/role.yaml index ff7ea1b4c15..4b6537b1b87 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/role.yaml +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/role.yaml @@ -34,13 +34,13 @@ rules: verbs: ["list", "watch"] {{ end -}} {{ if has "daemonsets" $.Values.collectors }} -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] {{ end -}} {{ if has "deployments" $.Values.collectors }} -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -64,7 +64,7 @@ rules: verbs: ["list", "watch"] {{ end -}} {{ if has "ingresses" $.Values.collectors }} -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -160,7 +160,7 @@ rules: verbs: ["list", "watch"] {{ end -}} {{ if has "replicasets" $.Values.collectors }} -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/scrapeconfig.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/scrapeconfig.yaml new file mode 100644 index 00000000000..028f3d1892c --- /dev/null +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/scrapeconfig.yaml @@ -0,0 +1,60 @@ +{{- if .Values.prometheus.scrapeconfig.enabled }} +apiVersion: monitoring.coreos.com/v1alpha1 +kind: ScrapeConfig +metadata: + name: {{ template "kube-state-metrics.fullname" . }} + namespace: {{ template "kube-state-metrics.namespace" . }} + labels: + {{- include "kube-state-metrics.labels" . | indent 4 }} + {{- with .Values.prometheus.scrapeconfig.additionalLabels }} + {{- tpl (toYaml . | nindent 4) $ }} + {{- end }} + {{- with .Values.prometheus.scrapeconfig.annotations }} + annotations: + {{- tpl (toYaml . | nindent 4) $ }} + {{- end }} +spec: + {{- include "scrapeconfig.scrapeLimits" .Values.prometheus.scrapeconfig | indent 2 }} + staticConfigs: + - targets: + - {{ template "kube-state-metrics.fullname" . }}.{{ template "kube-state-metrics.namespace" . }}.svc:{{ .Values.service.port }} + {{- if .Values.prometheus.scrapeconfig.staticConfigLabels}} + labels: + {{- with .Values.prometheus.scrapeconfig.staticConfigLabels }} + {{- tpl (toYaml . | nindent 8) $ }} + {{- end }} + {{- end }} +{{- if .Values.prometheus.scrapeconfig.jobName }} + jobName: {{ .Values.prometheus.scrapeconfig.jobName }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.honorLabels }} + honorLabels: true +{{- end }} +{{- if .Values.prometheus.scrapeconfig.scrapeInterval }} + scrapeInterval: {{ .Values.prometheus.scrapeconfig.scrapeInterval }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.scrapeTimeout }} + scrapeTimeout: {{ .Values.prometheus.scrapeconfig.scrapeTimeout }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.proxyUrl }} + proxyUrl: {{ .Values.prometheus.scrapeconfig.proxyUrl }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.enableHttp2 }} + enableHttp2: {{ .Values.prometheus.scrapeconfig.enableHttp2 }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.metricRelabelings }} + metricRelabelings: + {{- toYaml .Values.prometheus.scrapeconfig.metricRelabelings | nindent 4 }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.relabelings }} + relabelings: + {{- toYaml .Values.prometheus.scrapeconfig.relabelings | nindent 4 }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.scheme }} + scheme: {{ .Values.prometheus.scrapeconfig.scheme }} +{{- end }} +{{- if .Values.prometheus.scrapeconfig.tlsConfig }} + tlsConfig: + {{- toYaml (.Values.prometheus.scrapeconfig.tlsConfig ) | nindent 4 }} +{{- end }} +{{- end }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/service.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/service.yaml index 90c235148f2..d65fc3a4e0a 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/service.yaml +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/templates/service.yaml @@ -22,7 +22,7 @@ spec: - name: "http" protocol: TCP port: {{ .Values.service.port | default 8080}} - {{- if .Values.service.nodePort }} + {{- if ( and (eq .Values.service.type "NodePort" ) (not (empty .Values.service.nodePort)) ) }} nodePort: {{ .Values.service.nodePort }} {{- end }} targetPort: {{ .Values.service.port | default 8080}} @@ -31,7 +31,7 @@ spec: protocol: TCP port: {{ .Values.selfMonitor.telemetryPort | default 8081 }} targetPort: {{ .Values.selfMonitor.telemetryPort | default 8081 }} - {{- if .Values.selfMonitor.telemetryNodePort }} + {{- if ( and (eq .Values.service.type "NodePort" ) (not (empty .Values.service.nodePort)) ) }} nodePort: {{ .Values.selfMonitor.telemetryNodePort }} {{- end }} {{ end }} diff --git a/deploy/helm/elastic-agent/charts/kube-state-metrics/values.yaml b/deploy/helm/elastic-agent/charts/kube-state-metrics/values.yaml index 49571fbc56d..0f2027cfee8 100644 --- a/deploy/helm/elastic-agent/charts/kube-state-metrics/values.yaml +++ b/deploy/helm/elastic-agent/charts/kube-state-metrics/values.yaml @@ -106,7 +106,7 @@ kubeRBACProxy: image: registry: quay.io repository: brancz/kube-rbac-proxy - tag: v0.18.2 + tag: v0.19.1 sha: "" pullPolicy: IfNotPresent @@ -161,7 +161,7 @@ serviceAccount: automountServiceAccountToken: true # Additional Environment variables -env: {} +env: [] # - name: GOMAXPROCS # valueFrom: # resourceFieldRef: @@ -239,23 +239,46 @@ prometheus: # name: secret-name # key: key-name tlsConfig: {} + ## Create a scrapeConfig resource for scraping the kube-state-metrics service. Use this instead of serviceMonitor + ## to have more instances of kube-state-metrics safety. + scrapeconfig: + ## To avoid duplicate metrics, first disable the serviceMonitor creation via prometheus.monitor.enabled=false + enabled: false + annotations: {} + additionalLabels: {} + jobName: kube-state-metrics + ## SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. + ## + sampleLimit: 0 -## Specify if a Pod Security Policy for kube-state-metrics must be created -## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/ -## -podSecurityPolicy: - enabled: false - annotations: {} - ## Specify pod annotations - ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor - ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp - ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#sysctl + ## TargetLimit defines a limit on the number of scraped targets that will be accepted. ## - # seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*' - # seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' - # apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' + targetLimit: 0 - additionalVolumes: [] + ## Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer. + ## + labelLimit: 0 + + ## Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer. + ## + labelNameLengthLimit: 0 + + ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer. + ## + labelValueLengthLimit: 0 + + ## StaticConfigLabels defines the labels to be used in the Prometheus static configuration for scraping. + staticConfigLabels: {} + scrapeInterval: "" + scrapeTimeout: "" + proxyUrl: "" + ## Whether to enable HTTP2 for scrapeconfig + enableHttp2: false + honorLabels: true + metricRelabelings: [] + relabelings: [] + scheme: "" + tlsConfig: {} ## Configure network policy for kube-state-metrics networkPolicy: @@ -326,6 +349,9 @@ topologySpreadConstraints: [] # Annotations to be added to the deployment/statefulset annotations: {} +# Labels to be added to the deployment/statefulset +labels: {} + # Annotations to be added to the pod podAnnotations: {} @@ -410,8 +436,19 @@ kubeconfig: # Enabling support for customResourceState, will create a configMap including your config that will be read from kube-state-metrics customResourceState: + # Whether to enable support for CustomResourceStateMetrics. enabled: false - # Add (Cluster)Role permissions to list/watch the customResources defined in the config to rbac.extraRules + + # Whether to create the ConfigMap that holds the config. + create: true + + # Name of the ConfigMap that holds the config. If empty, name will be generated based on the release name. + name: "" + + # ConfigMap key that holds the config. + key: config.yaml + + # Definition of the CustomResourceStateMetrics. Add (Cluster)Role permissions to list/watch the resources defined in the config to rbac.extraRules. config: {} # Enable only the release namespace for collecting resources. By default all namespaces are collected. @@ -441,11 +478,6 @@ resources: {} # cpu: 10m # memory: 32Mi -## Provide a k8s version to define apiGroups for podSecurityPolicy Cluster Role. -## For example: kubeTargetVersionOverride: 1.14.9 -## -kubeTargetVersionOverride: "" - # Enable self metrics configuration for service and Service Monitor # Default values for telemetry configuration can be overridden # If you set telemetryNodePort, you must also set service.type to NodePort @@ -519,6 +551,14 @@ initContainers: [] # - name: crd-sidecar # image: kiwigrid/k8s-sidecar:latest +## dnsPolicy allows to change the default DNS configuration for the pod +## Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy +dnsPolicy: ClusterFirst + +## dnsConfig allows setting up specific DNS configuration for the pod +## Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config +dnsConfig: {} + ## Settings for startup, liveness and readiness probes ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ ## diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml index 69bdb5b6a67..f1f1bd7f53c 100644 --- a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -464,13 +464,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -489,12 +489,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -509,7 +509,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -569,7 +569,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -783,13 +783,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -849,13 +849,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -877,13 +877,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -896,13 +896,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -914,13 +914,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml index 83f268d5c71..9ceb07fabe5 100644 --- a/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -78,13 +78,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -103,12 +103,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -123,7 +123,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -183,7 +183,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -313,13 +313,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -356,13 +356,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -528,13 +528,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -547,13 +547,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -565,13 +565,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml index 79b47a7eb26..2197feb3d6d 100644 --- a/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -38,13 +38,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -63,12 +63,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -83,7 +83,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -143,7 +143,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -193,13 +193,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -217,13 +217,13 @@ metadata: name: stsdiscovery-kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" rules: - apiGroups: - "" @@ -249,13 +249,13 @@ metadata: name: stsdiscovery-kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -272,13 +272,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -301,13 +301,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -320,13 +320,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: checksum/config: 3ffd84be56846b5601fb4376e7c2e6056e929f4a78f3697ac266fd0269ba41af @@ -341,6 +341,7 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics env: @@ -359,7 +360,7 @@ spec: - --pod=$(POD_NAME) - --pod-namespace=$(POD_NAMESPACE) imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml index fa0727ec526..11c2e771d06 100644 --- a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -56,13 +56,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -81,12 +81,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -101,7 +101,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -161,7 +161,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -291,13 +291,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -334,13 +334,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -478,13 +478,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -497,13 +497,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -515,13 +515,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml index 9cab204f73f..c672541bdd9 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -602,13 +602,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -627,12 +627,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -647,7 +647,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -707,7 +707,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -917,13 +917,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -979,13 +979,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -1138,13 +1138,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -1157,13 +1157,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -1175,13 +1175,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml index 8fac392041f..abc096e9fb1 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -470,13 +470,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -495,12 +495,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -515,7 +515,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -575,7 +575,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -785,13 +785,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -847,13 +847,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -971,13 +971,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -990,13 +990,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -1008,13 +1008,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml index 8aed527087b..6bd55e790a4 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -473,13 +473,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -498,12 +498,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -518,7 +518,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -578,7 +578,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -788,13 +788,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -850,13 +850,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -974,13 +974,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -993,13 +993,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -1011,13 +1011,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml index c532c1818a8..cf247513128 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -478,13 +478,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -503,12 +503,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -523,7 +523,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -583,7 +583,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -793,13 +793,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -855,13 +855,13 @@ metadata: name: stsdiscovery-kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" rules: - apiGroups: - "" @@ -887,13 +887,13 @@ metadata: name: stsdiscovery-kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -910,13 +910,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -1136,13 +1136,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -1155,13 +1155,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: checksum/config: d86c07ea79de1388d0a81565edd84ba54f07ce89dc2d060514a1c744104e8f90 @@ -1176,6 +1176,7 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics env: @@ -1194,7 +1195,7 @@ spec: - --pod=$(POD_NAME) - --pod-namespace=$(POD_NAMESPACE) imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml index 7698dfbe2ba..916ae69e229 100644 --- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -499,13 +499,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -524,12 +524,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -544,7 +544,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -604,7 +604,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -814,13 +814,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -876,13 +876,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -990,13 +990,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -1009,13 +1009,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -1027,13 +1027,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml index 583173e9826..d57139145fc 100644 --- a/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml @@ -15,13 +15,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -480,13 +480,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -505,12 +505,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -525,7 +525,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -585,7 +585,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -795,13 +795,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -857,13 +857,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -982,13 +982,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -1001,13 +1001,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -1019,13 +1019,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml index 6f11987cb68..1d875e31b13 100644 --- a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml @@ -5,13 +5,13 @@ kind: ServiceAccount automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics namespace: default --- @@ -446,13 +446,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics rules: @@ -471,12 +471,12 @@ rules: - cronjobs verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - daemonsets verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - deployments verbs: ["list", "watch"] @@ -491,7 +491,7 @@ rules: - horizontalpodautoscalers verbs: ["list", "watch"] -- apiGroups: ["extensions", "networking.k8s.io"] +- apiGroups: ["networking.k8s.io"] resources: - ingresses verbs: ["list", "watch"] @@ -551,7 +551,7 @@ rules: - pods verbs: ["list", "watch"] -- apiGroups: ["extensions", "apps"] +- apiGroups: ["apps"] resources: - replicasets verbs: ["list", "watch"] @@ -765,13 +765,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io @@ -827,13 +827,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" annotations: prometheus.io/scrape: 'true' spec: @@ -951,13 +951,13 @@ metadata: name: kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: selector: matchLabels: @@ -970,13 +970,13 @@ spec: template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.30.1 + helm.sh/chart: kube-state-metrics-6.1.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: example - app.kubernetes.io/version: "2.15.0" + app.kubernetes.io/version: "2.16.0" spec: automountServiceAccountToken: true hostNetwork: false @@ -988,13 +988,14 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst containers: - name: kube-state-metrics args: - --port=8080 - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments imagePullPolicy: IfNotPresent - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 ports: - containerPort: 8080 name: "http" diff --git a/magefile.go b/magefile.go index 911342e6319..22a6ccaa92b 100644 --- a/magefile.go +++ b/magefile.go @@ -3915,18 +3915,7 @@ func (Helm) ensureRepository(repoName, repoURL string, settings *cli.EnvSettings return nil } -// BuildDependencies builds the dependencies for the Elastic-Agent Helm chart. -// -// This is a custom implementation that extends the functionality of `helm dependency update`. -// The standard Helm command assumes that all dependency repositories have been added beforehand -// via `helm repo add`, otherwise it fails. This method improves usability by ensuring all -// required repositories are added automatically before resolving dependencies. -// -// Furthermore, `helm dependency update` downloads dependencies as `.tgz` archives into the `charts/` -// directory but does not untar them. For our integration tests, we require the subcharts to be -// extracted. This method downloads and extracts each `.tgz` archive and removes the archive afterward, -// so that only the extracted subcharts remain in the `charts/` directory. -func (h Helm) BuildDependencies() error { +func (h Helm) handleDependencies(update bool) error { settings := cli.New() settings.SetNamespace("") actionConfig := &action.Configuration{} @@ -3994,9 +3983,15 @@ func (h Helm) BuildDependencies() error { if client.Verify { man.Verify = downloader.VerifyIfPossible } - err = man.Build() - if err != nil { - return fmt.Errorf("failed to build helm dependencies: %w", err) + + if update { + if err = man.Update(); err != nil { + return fmt.Errorf("failed to build helm dependencies: %w", err) + } + } else { + if err = man.Build(); err != nil { + return fmt.Errorf("failed to update helm dependencies: %w", err) + } } subChartDir := filepath.Join(helmChartPath, "charts") @@ -4025,6 +4020,25 @@ func (h Helm) BuildDependencies() error { return nil } +// BuildDependencies builds the dependencies for the Elastic-Agent Helm chart. +// +// This is a custom implementation that extends the functionality of `helm dependency update`. +// The standard Helm command assumes that all dependency repositories have been added beforehand +// via `helm repo add`, otherwise it fails. This method improves usability by ensuring all +// required repositories are added automatically before resolving dependencies. +// +// Furthermore, `helm dependency update` downloads dependencies as `.tgz` archives into the `charts/` +// directory but does not untar them. For our integration tests, we require the subcharts to be +// extracted. This method downloads and extracts each `.tgz` archive and removes the archive afterward, +// so that only the extracted subcharts remain in the `charts/` directory. +func (h Helm) BuildDependencies() error { + return h.handleDependencies(false) +} + +func (h Helm) UpdateDependencies() error { + return h.handleDependencies(true) +} + // Package packages the Elastic-Agent Helm chart. Note that you need to set SNAPSHOT="false" to build a production-ready package. func (h Helm) Package() error { mg.SerialDeps(h.BuildDependencies)