Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

Commit 557cfdd

Browse files
committed
bump: update kubernetes metrics server to latest
Signed-off-by: Gerard Vanloo <gerard.vanloo@ibm.com>
1 parent e00815f commit 557cfdd

5 files changed

Lines changed: 52 additions & 30 deletions

File tree

sre/dev/local_cluster/kind-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ apiVersion: kind.x-k8s.io/v1alpha4
33
name: kind-cluster
44
nodes:
55
- role: control-plane
6+
kubeadmConfigPatches:
7+
- |
8+
apiVersion: kubeadm.k8s.io/v1beta4
9+
kind: ClusterConfiguration
10+
- |
11+
apiVersion: kubelet.config.k8s.io/v1beta1
12+
kind: KubeletConfiguration
13+
serverTLSBootstrap: true

sre/roles/tools/tasks/install.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
11
---
2+
- name: Retrieve all kubelet-serving certificates
3+
kubernetes.core.k8s_info:
4+
api_version: certificates.k8s.io/v1
5+
kind: CertificateSigningRequest
6+
kubeconfig: "{{ tools_cluster.kubeconfig }}"
7+
field_selectors:
8+
- spec.signerName=kubernetes.io/kubelet-serving
9+
wait: true
10+
register: csr_info
11+
when:
12+
- tools_cluster.cloud_provider == 'kind'
13+
14+
- name: Approve pending certificates
15+
ansible.builtin.command:
16+
cmd: kubectl certificate approve {{ item.metadata.name }}
17+
environment:
18+
KUBECONFIG: "{{ tools_cluster.kubeconfig | ansible.builtin.expanduser }}"
19+
register: cert_approve_output
20+
changed_when: cert_approve_output.rc == 0
21+
loop: "{{ csr_info.resources }}"
22+
when:
23+
- tools_cluster.cloud_provider == 'kind'
24+
- item.status.conditions is not defined
25+
26+
- name: Wait for approvals to clear
27+
kubernetes.core.k8s_info:
28+
api_version: certificates.k8s.io/v1
29+
kind: CertificateSigningRequest
30+
kubeconfig: "{{ tools_cluster.kubeconfig }}"
31+
name: "{{ item.metadata.name }}"
32+
wait: true
33+
wait_condition:
34+
type: Approved
35+
status: "True"
36+
loop: "{{ csr_info.resources }}"
37+
when:
38+
- tools_cluster.cloud_provider == 'kind'
39+
- item.status.conditions is not defined
40+
241
- name: Import Prometheus installation tasks
342
ansible.builtin.import_tasks:
443
file: install_prometheus.yaml

sre/roles/tools/tasks/install_kubernetes_metrics_server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
kubernetes.core.helm:
1616
chart_ref: metrics-server
1717
chart_repo_url: https://kubernetes-sigs.github.io/metrics-server/
18-
chart_version: 3.12.2
18+
chart_version: 3.13.0
1919
kubeconfig: "{{ tools_cluster.kubeconfig }}"
2020
release_name: "{{ helm_release.name }}"
2121
release_namespace: "{{ helm_release.namespace }}"

sre/roles/tools/tasks/reinit_kubernetes_metrics_server.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@
1818
namespace: "{{ helm_release.namespace }}"
1919
replicas: 1
2020
wait: true
21+
wait_timeout: 60

sre/roles/tools/tasks/reinit_opensearch.yaml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
- DELETE
3131
- http://opensearch-cluster-master:9200/{{ item.index }}
3232
restartPolicy: Never
33+
ttlSecondsAfterFinished: 60
34+
state: present
3335
loop: "{{ opensearch_deletion_jobs }}"
3436
loop_control:
3537
label: job/{{ item.name }}
@@ -39,7 +41,7 @@
3941
api_version: batch/v1
4042
kind: Job
4143
kubeconfig: "{{ tools_cluster.kubeconfig }}"
42-
name: opensearch-{{ item.name }}-index-deleter
44+
name: "{{ item.name }}"
4345
namespace: "{{ helm_release.namespace }}"
4446
wait: true
4547
wait_condition:
@@ -48,31 +50,3 @@
4850
loop: "{{ opensearch_deletion_jobs }}"
4951
loop_control:
5052
label: job/{{ item.name }}
51-
52-
- name: Delete all jobs
53-
kubernetes.core.k8s:
54-
kubeconfig: "{{ tools_cluster.kubeconfig }}"
55-
resource_definition:
56-
apiVersion: batch/v1
57-
kind: Job
58-
metadata:
59-
name: opensearch-{{ item.name }}-index-deleter
60-
namespace: "{{ helm_release.namespace }}"
61-
state: absent
62-
loop: "{{ opensearch_deletion_jobs }}"
63-
loop_control:
64-
label: job/{{ item.name }}
65-
66-
- name: Delete all job pods
67-
kubernetes.core.k8s:
68-
delete_all: true
69-
kind: Pod
70-
kubeconfig: "{{ tools_cluster.kubeconfig }}"
71-
label_selectors:
72-
- job-name=opensearch-{{ item.name }}-index-deleter
73-
namespace: "{{ helm_release.namespace }}"
74-
state: absent
75-
wait: true
76-
loop: "{{ opensearch_deletion_jobs }}"
77-
loop_control:
78-
label: job/{{ item.name }}

0 commit comments

Comments
 (0)