Skip to content

Commit 25b753c

Browse files
fmunteanufmunteanu
authored
Merge pull request k3s-io#442 from axivo/fix/cluster-improvements
fix: cluster improvements
2 parents c906e6a + 6ce9e4f commit 25b753c

57 files changed

Lines changed: 1236 additions & 439 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/renovate.json5‎

Lines changed: 72 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
"roles/argo-cd/defaults/main.yaml"
6969
],
7070
"matchStrings": [
71-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
72-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
71+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
72+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
7373
]
7474
},
7575
{
@@ -82,8 +82,8 @@
8282
"roles/argo-cd/defaults/main.yaml"
8383
],
8484
"matchStrings": [
85-
"dependencies:[\\s\\S]+?name:\\s+argocd[\\s\\S]+?version:\\s+(?<currentValue>.+)",
86-
"release:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
85+
"dependencies:[\\s\\S]+name:\\s+argocd[\\s\\S]+version:\\s+(?<currentValue>.+)",
86+
"release:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
8787
]
8888
},
8989
{
@@ -96,8 +96,8 @@
9696
"roles/cert-manager/defaults/main.yaml"
9797
],
9898
"matchStrings": [
99-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
100-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
99+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
100+
"kubernetes:[\\s\\S]+helm:\\s+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
101101
]
102102
},
103103
{
@@ -110,8 +110,8 @@
110110
"roles/cert-manager/defaults/main.yaml"
111111
],
112112
"matchStrings": [
113-
"dependencies:[\\s\\S]+?name:\\s+cmctl[\\s\\S]+?version:\\s+(?<currentValue>.+)",
114-
"release:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
113+
"dependencies:[\\s\\S]+name:\\s+cmctl[\\s\\S]+version:\\s+(?<currentValue>.+)",
114+
"release:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
115115
]
116116
},
117117
{
@@ -124,8 +124,8 @@
124124
"roles/cilium/defaults/main.yaml"
125125
],
126126
"matchStrings": [
127-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
128-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
127+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
128+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
129129
]
130130
},
131131
{
@@ -138,8 +138,8 @@
138138
"roles/cilium/defaults/main.yaml"
139139
],
140140
"matchStrings": [
141-
"dependencies:[\\s\\S]+?name:\\s+cilium-cli[\\s\\S]+?version:\\s+(?<currentValue>.+)",
142-
"release:[\\s\\S]+cli:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
141+
"dependencies:[\\s\\S]+name:\\s+cilium-cli[\\s\\S]+version:\\s+(?<currentValue>.+)",
142+
"release:[\\s\\S]+cli:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
143143
]
144144
},
145145
{
@@ -152,8 +152,8 @@
152152
"roles/cilium/defaults/main.yaml"
153153
],
154154
"matchStrings": [
155-
"dependencies:[\\s\\S]+?name:\\s+gateway-api[\\s\\S]+?version:\\s+(?<currentValue>.+)",
156-
"release:[\\s\\S]+gateway_api:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
155+
"dependencies:[\\s\\S]+name:\\s+gateway-api[\\s\\S]+version:\\s+(?<currentValue>.+)",
156+
"release:[\\s\\S]+gateway_api:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
157157
]
158158
},
159159
{
@@ -166,8 +166,8 @@
166166
"roles/cilium/defaults/main.yaml"
167167
],
168168
"matchStrings": [
169-
"dependencies:[\\s\\S]+?name:\\s+hubble[\\s\\S]+?version:\\s+(?<currentValue>.+)",
170-
"release:[\\s\\S]+hubble:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
169+
"dependencies:[\\s\\S]+name:\\s+hubble[\\s\\S]+version:\\s+(?<currentValue>.+)",
170+
"release:[\\s\\S]+hubble:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
171171
]
172172
},
173173
{
@@ -178,22 +178,22 @@
178178
"roles/cluster/Chart.yaml"
179179
],
180180
"matchStrings": [
181-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)"
181+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)"
182182
],
183-
"versioningTemplate": "debian"
183+
"versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-(?<build>\\d+))?$"
184184
},
185185
{
186186
"customType": "regex",
187187
"datasourceTemplate": "github-releases",
188-
"depNameTemplate": "coredns/coredns",
188+
"depNameTemplate": "coredns/helm",
189189
"extractVersionTemplate": "^coredns-(?<version>.+)$",
190190
"fileMatch": [
191191
"roles/coredns/Chart.yaml",
192192
"roles/coredns/defaults/main.yaml"
193193
],
194194
"matchStrings": [
195-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
196-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
195+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
196+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
197197
]
198198
},
199199
{
@@ -206,23 +206,23 @@
206206
"roles/external-dns/defaults/main.yaml"
207207
],
208208
"matchStrings": [
209-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
210-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
209+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
210+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
211211
]
212212
},
213213
{
214214
"customType": "regex",
215215
"datasourceTemplate": "custom.helm",
216-
"depNameTemplate": "debian/helm",
216+
"depNameTemplate": "balto/helm",
217217
"fileMatch": [
218218
"roles/helm/Chart.yaml",
219219
"roles/helm/defaults/main.yaml"
220220
],
221221
"matchStrings": [
222-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
223-
"release:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
222+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
223+
"release:[\\s\\S]+helm:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
224224
],
225-
"versioningTemplate": "helm"
225+
"versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-(?<build>\\d+))?$"
226226
},
227227
{
228228
"customType": "regex",
@@ -234,8 +234,8 @@
234234
"roles/helm/defaults/main.yaml"
235235
],
236236
"matchStrings": [
237-
"dependencies:[\\s\\S]+?name:\\s+diff[\\s\\S]+?version:\\s+(?<currentValue>.+)",
238-
"plugins:[\\s\\S]+name:\\s+diff[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
237+
"dependencies:[\\s\\S]+?name:\\s+diff[\\s\\S]+version:\\s+(?<currentValue>.+)",
238+
"plugins:[\\s\\S]+name:\\s+diff[\\s\\S]+version:\\s+v(?<currentValue>.+)"
239239
]
240240
},
241241
{
@@ -248,8 +248,8 @@
248248
"roles/k3s/defaults/main.yaml"
249249
],
250250
"matchStrings": [
251-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
252-
"release:[\\s\\S]+k3s:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
251+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
252+
"release:[\\s\\S]+k3s:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
253253
],
254254
"versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?<compatibility>\\+k3s)(?<build>\\d+)$"
255255
},
@@ -263,8 +263,8 @@
263263
"roles/k3s/defaults/main.yaml"
264264
],
265265
"matchStrings": [
266-
"dependencies:[\\s\\S]+?name:\\s+kubepug[\\s\\S]+?version:\\s+(?<currentValue>.+)",
267-
"release:[\\s\\S]+kubepug:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
266+
"dependencies:[\\s\\S]+?name:\\s+kubepug[\\s\\S]+version:\\s+(?<currentValue>.+)",
267+
"release:[\\s\\S]+kubepug:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
268268
]
269269
},
270270
{
@@ -277,11 +277,25 @@
277277
"roles/kured/defaults/main.yaml"
278278
],
279279
"matchStrings": [
280-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
281-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
280+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
281+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
282282
],
283283
"packageNameTemplate": "kubereboot/charts"
284284
},
285+
{
286+
"customType": "regex",
287+
"datasourceTemplate": "github-releases",
288+
"depNameTemplate": "longhorn/cli",
289+
"extractVersionTemplate": "^v(?<version>.+)$",
290+
"fileMatch": [
291+
"roles/longhorn/Chart.yaml",
292+
"roles/longhorn/defaults/main.yaml"
293+
],
294+
"matchStrings": [
295+
"dependencies:[\\s\\S]+?name:\\s+longhornctl[\\s\\S]+version:\\s+(?<currentValue>.+)",
296+
"release:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
297+
]
298+
},
285299
{
286300
"customType": "regex",
287301
"datasourceTemplate": "github-releases",
@@ -292,8 +306,8 @@
292306
"roles/longhorn/defaults/main.yaml"
293307
],
294308
"matchStrings": [
295-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
296-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
309+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
310+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
297311
],
298312
"packageNameTemplate": "longhorn/charts"
299313
},
@@ -307,8 +321,8 @@
307321
"roles/metrics-server/defaults/main.yaml"
308322
],
309323
"matchStrings": [
310-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
311-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
324+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
325+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
312326
]
313327
},
314328
{
@@ -321,8 +335,23 @@
321335
"roles/victoria-logs/defaults/main.yaml"
322336
],
323337
"matchStrings": [
324-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
325-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
338+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)",
339+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+version:\\s+v(?<currentValue>.+)"
340+
],
341+
"packageNameTemplate": "VictoriaMetrics/helm-charts"
342+
},
343+
{
344+
"customType": "regex",
345+
"datasourceTemplate": "github-releases",
346+
"depNameTemplate": "prometheus-community/helm-charts",
347+
"extractVersionTemplate": "^prometheus-operator-crds-(?<version>.+)$",
348+
"fileMatch": [
349+
"roles/victoria-metrics/Chart.yaml",
350+
"roles/victoria-metrics/defaults/main.yaml"
351+
],
352+
"matchStrings": [
353+
"dependencies:[\\s\\S]+?name:\\s+prometheus-operator-crds[\\s\\S]+version:\\s+(?<currentValue>.+)",
354+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+prometheus[\\s\\S]+version:\\s+v(?<currentValue>.+)"
326355
],
327356
"packageNameTemplate": "VictoriaMetrics/helm-charts"
328357
},
@@ -336,8 +365,8 @@
336365
"roles/victoria-metrics/defaults/main.yaml"
337366
],
338367
"matchStrings": [
339-
"type:[\\s\\S]+version:\\s+(?<currentValue>.+)",
340-
"helm:\\s+chart:[\\s\\S]+?version:\\s+v(?<currentValue>.+)"
368+
"type:\\s+application[\\s\\S]+version:\\s+(?<currentValue>.+)$",
369+
"kubernetes:[\\s\\S]+helm:[\\s\\S]+chart:[\\s\\S]+victoriametrics[\\s\\S]+version:\\s+v(?<currentValue>.+)"
341370
],
342371
"packageNameTemplate": "VictoriaMetrics/helm-charts"
343372
}

‎roles/argo-cd/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apiVersion: v2
22
name: argo-cd
33
description: Documentation generator for argo-cd Ansible role
44
home: https://github.com/argoproj/argo-helm
5+
type: application
6+
version: 7.8.8
7+
appVersion: 1.0.0
58
dependencies:
69
- name: argocd
710
repository: https://github.com/argoproj/argo-cd
811
version: 2.14.4
9-
type: application
10-
version: 7.8.8
11-
appVersion: 1.0.0

‎roles/argo-cd/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ See the related role variables listed below, defined into [main.yaml](./defaults
5858
| argocd_vars.kubernetes.haproxy.resources.requests.cpu | string | `"10m"` | |
5959
| argocd_vars.kubernetes.haproxy.resources.requests.memory | string | `"128Mi"` | |
6060
| argocd_vars.kubernetes.helm.chart.name | string | `"argo-cd"` | |
61-
| argocd_vars.kubernetes.helm.chart.version | string | `"v7.8.8"` | |
61+
| argocd_vars.kubernetes.helm.chart.version | string | `"v7.8.11"` | |
6262
| argocd_vars.kubernetes.helm.repository.name | string | `"argo-helm"` | |
6363
| argocd_vars.kubernetes.helm.repository.org | string | `"argoproj"` | |
6464
| argocd_vars.kubernetes.helm.repository.url | string | `"https://argoproj.github.io"` | |
@@ -103,4 +103,4 @@ See the related role variables listed below, defined into [main.yaml](./defaults
103103
| argocd_vars.release.file | string | `"argocd-linux-arm64"` | See [documentation](https://axivo.com/k3s-cluster/tutorials/handbook/server/#hardware), for details |
104104
| argocd_vars.release.repository.name | string | `"argo-cd"` | |
105105
| argocd_vars.release.repository.org | string | `"argoproj"` | |
106-
| argocd_vars.release.version | string | `"v2.14.4"` | |
106+
| argocd_vars.release.version | string | `"v2.14.5"` | |

‎roles/argo-cd/defaults/main.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ argocd_vars:
8989
helm:
9090
chart:
9191
name: argo-cd
92-
version: v7.8.8
92+
version: v7.8.11
9393
repository:
9494
name: argo-helm
9595
org: argoproj
@@ -181,4 +181,4 @@ argocd_vars:
181181
repository:
182182
name: argo-cd
183183
org: argoproj
184-
version: v2.14.4
184+
version: v2.14.5

‎roles/argo-cd/tasks/facts.yaml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
chart:
2828
reference: '{{ argocd_vars.kubernetes.helm.repository.org }}/{{ argocd_vars.kubernetes.helm.chart.name }}'
2929
version: '{{ argocd_vars.kubernetes.helm.chart.version[1:] }}'
30+
platform:
31+
key: https://github.com
32+
raw: https://raw.githubusercontent.com
3033
repository:
3134
name: '{{ argocd_vars.kubernetes.helm.repository.org }}/{{ argocd_vars.kubernetes.helm.repository.name }}'
3235
url: '{{ argocd_vars.kubernetes.helm.repository.url }}/{{ argocd_vars.kubernetes.helm.repository.name }}'
@@ -40,18 +43,21 @@
4043
interval: null
4144
# If `null`, default value is `victoriametrics_map.service.monitor.scrape.timeout`
4245
timeout: null
43-
release:
44-
url: 'https://github.com/{{ argocd_vars.release.repository.org }}/{{ argocd_vars.release.repository.name }}/releases'
4546
run_once: true
4647

4748
- name: Set project fact
4849
ansible.builtin.set_fact:
4950
argocd_project:
5051
release:
51-
checksum: '{{ argocd_map.release.url }}/download/{{ argocd_vars.release.version }}/{{ argocd_vars.release.checksum }}'
52-
file: '{{ argocd_map.release.url }}/download/{{ argocd_vars.release.version }}/{{ argocd_vars.release.file }}'
52+
checksum: '{{ argocd_vars.release.version }}/{{ argocd_vars.release.checksum }}'
53+
file: '{{ argocd_vars.release.version }}/{{ argocd_vars.release.file }}'
54+
url: "{{
55+
'/'.join([argocd_map.helm.platform.key,
56+
argocd_vars.release.repository.org,
57+
argocd_vars.release.repository.name, 'releases', 'download'])
58+
}}"
5359
tag: '{{ argocd_vars.kubernetes.helm.chart.name }}-{{ argocd_map.helm.chart.version }}'
54-
url: 'https://github.com/{{ argocd_map.helm.repository.name }}/releases/tag'
60+
url: '{{ argocd_map.helm.platform.key }}/{{ argocd_map.helm.repository.name }}/releases/tag'
5561
run_once: true
5662

5763
- name: Set resources fact

‎roles/argo-cd/tasks/main.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
- name: Validate service state
1111
ansible.builtin.wait_for:
1212
port: '{{ k3s_vars.server.api.port }}'
13-
state: drained
1413
timeout: 30
1514
any_errors_fatal: true
1615

1716
- name: Set checksums fact
1817
ansible.builtin.uri:
19-
url: '{{ argocd_project.release.checksum }}'
18+
url: '{{ argocd_project.release.url }}/{{ argocd_project.release.checksum }}'
2019
return_content: true
2120
register: checksums
2221
delay: 1
@@ -34,7 +33,7 @@
3433

3534
- name: Install binary
3635
ansible.builtin.get_url:
37-
url: '{{ argocd_project.release.file }}'
36+
url: '{{ argocd_project.release.url }}/{{ argocd_project.release.file }}'
3837
checksum: sha256:{{ sha256_checksum }}
3938
dest: '{{ k3s_map.node.directory.bin }}/argocd'
4039
owner: root

0 commit comments

Comments
 (0)