Skip to content

Commit 0412f0b

Browse files
committed
feat: argocd upgrade
1 parent 458cdf5 commit 0412f0b

File tree

6 files changed

+29
-20
lines changed

6 files changed

+29
-20
lines changed

roles/argo-cd/defaults/main.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ argocd_vars:
111111
# -- Helm chart name
112112
name: argo-cd
113113
# -- Helm chart version
114-
version: v7.8.28
114+
version: v8.0.17
115115
repository:
116116
# -- Repository name in Helm
117117
name: argo-helm
@@ -216,7 +216,9 @@ argocd_vars:
216216
password:
217217
ingress:
218218
# -- See [documentation](https://axivo.com/k3s-cluster/tutorials/handbook/externaldns/#front-ends), for details
219-
subdomain: argocd
219+
subdomain:
220+
api: argocd
221+
grpc: grpc.argocd
220222
resources:
221223
limits:
222224
# -- CPU limit, `null` for no limit
@@ -239,4 +241,4 @@ argocd_vars:
239241
# -- Organization name
240242
org: argoproj
241243
# -- CLI version to install
242-
version: v2.14.11
244+
version: v3.0.6

roles/argo-cd/tasks/facts.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
server:
1616
annotations:
1717
api:
18-
cert-manager.io/cluster-issuer: '{{ externaldns_project.cloudflare.cluster.issuer }}'
18+
ingress.cilium.io/tls-passthrough: enabled
1919
grpc:
20-
cert-manager.io/cluster-issuer: '{{ externaldns_project.cloudflare.cluster.issuer }}'
2120
ingress.cilium.io/tls-passthrough: enabled
22-
hostname: '{{ argocd_vars.kubernetes.server.ingress.subdomain }}.{{ externaldns_vars.cloudflare.host.domain }}'
21+
hostname:
22+
api: '{{ argocd_vars.kubernetes.server.ingress.subdomain.api }}.{{ externaldns_vars.cloudflare.host.domain }}'
23+
grpc: '{{ argocd_vars.kubernetes.server.ingress.subdomain.grpc }}.{{ externaldns_vars.cloudflare.host.domain }}'
2324
helm:
2425
chart:
2526
reference: '{{ argocd_vars.kubernetes.helm.repository.org }}/{{ argocd_vars.kubernetes.helm.chart.name }}'

roles/argo-cd/tasks/validation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
name: '{{ argocd_vars.kubernetes.helm.chart.name }}'
6363
namespace: '{{ argocd_vars.kubernetes.namespace }}'
6464
register: release
65-
changed_when: false
6665
when: kubeconfig.stat.exists
66+
changed_when: false
6767

6868
- name: Set comparison fact
6969
ansible.builtin.set_fact:

roles/argo-cd/templates/config_cm.j2

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ statusbadge.enabled: {{ argocd_vars.kubernetes.configs.cm.status_badge.enabled |
99
resource.exclusions: |
1010
- apiGroups:
1111
- cilium.io
12-
- snapshot.storage.k8s.io
1312
kinds:
1413
- CiliumClusterwideNetworkPolicy
15-
- CiliumIdentity
1614
- CiliumNetworkPolicy
15+
clusters:
16+
- "*"
17+
- apiGroups:
18+
- snapshot.storage.k8s.io
19+
kinds:
1720
- VolumeSnapshot
1821
- VolumeSnapshotContent
1922
clusters:

roles/argo-cd/templates/config_rbac.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
policy.csv: |
77
{% for user in argocd_resources.server.users %}
88
{{ ', '.join(['g', user.name, 'role']) | indent(2) }}:{{ user.role }}
9+
{{ ', '.join(['p', user.name, 'logs', 'get', '*/*', 'allow']) | indent(2) }}
910
{% endfor %}
1011
policy.default: role:readonly

roles/argo-cd/templates/values.j2

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ global:
55
maxUnavailable: 0
66
type: RollingUpdate
77
{% if externaldns_vars.cloudflare.host.domain | lower != 'disabled' %}
8-
domain: {{ argocd_map.ingress.server.hostname }}
8+
domain: {{ argocd_map.ingress.server.hostname.api }}
99
{% endif %}
1010
logging:
1111
level: {{ argocd_vars.kubernetes.global.logging.level }}
12+
networkPolicy:
13+
create: true
1214
applicationSet:
1315
{% if argocd_postinstall is truthy and argocd_map.metrics.service.monitor.enabled is truthy %}
1416
metrics:
@@ -270,30 +272,30 @@ server:
270272
group: cert-manager.io
271273
kind: ClusterIssuer
272274
name: {{ externaldns_project.cloudflare.cluster.issuer }}
273-
privateKey:
274-
rotationPolicy: Always
275+
containerPorts:
276+
server: 443
275277
{% endif %}
276278
ingress:
279+
enabled: true
280+
{% if argocd_vars.kubernetes.configs.params.server.insecure is falsy %}
277281
annotations:
278282
{% for key, value in argocd_map.ingress.server.annotations.api.items() %}
279283
{{ key | indent(6) }}: {{ value }}
280284
{% endfor %}
281-
enabled: true
282-
ingressClassName: {{ argocd_map.ingress.class.name }}
283-
{% if argocd_vars.kubernetes.configs.params.server.insecure is falsy %}
284285
tls: true
285286
{% endif %}
287+
ingressClassName: {{ argocd_map.ingress.class.name }}
286288
ingressGrpc:
289+
enabled: true
290+
{% if argocd_vars.kubernetes.configs.params.server.insecure is falsy %}
287291
annotations:
288-
{% for key, value in argocd_map.ingress.server.annotations.grpc.items() %}
292+
{% for key, value in argocd_map.ingress.server.annotations.api.items() %}
289293
{{ key | indent(6) }}: {{ value }}
290294
{% endfor %}
291-
enabled: true
292-
ingressClassName: {{ argocd_map.ingress.class.name }}
293-
hostname: {{ argocd_map.ingress.server.hostname }}
294-
{% if argocd_vars.kubernetes.configs.params.server.insecure is falsy %}
295295
tls: true
296296
{% endif %}
297+
ingressClassName: {{ argocd_map.ingress.class.name }}
298+
hostname: {{ argocd_map.ingress.server.hostname.grpc }}
297299
{% endif %}
298300
{% if argocd_postinstall is truthy and argocd_map.metrics.service.monitor.enabled is truthy %}
299301
metrics:

0 commit comments

Comments
 (0)