Compare commits
50 commits
7ba4334b23
...
05e0c8558c
Author | SHA1 | Date | |
---|---|---|---|
05e0c8558c | |||
7a934a9c0f | |||
738291fe4b | |||
ac9e8d4a43 | |||
2574a9ff4d | |||
1d39674dbd | |||
a80dfc4b54 | |||
99908ed55b | |||
61a3057a0a | |||
210055c43b | |||
a272504bca | |||
38c32f0fb3 | |||
30c38b281d | |||
c6e5b93055 | |||
fe6b44554f | |||
fa7fea315f | |||
e541b539d7 | |||
b84ac9686d | |||
bb7804344f | |||
6c9c86df57 | |||
adfd98283c | |||
f1210f501a | |||
160247d69f | |||
003f654836 | |||
1be01b52ae | |||
22a1d646bf | |||
0098aa82ab | |||
b85658bbf6 | |||
018b232cbe | |||
a65d4e8455 | |||
6989dad9a2 | |||
638f1a7a46 | |||
2c9586be67 | |||
eec3113ea1 | |||
468148fb0a | |||
a95def7a2e | |||
3c7ea554fd | |||
2bb25a7a83 | |||
92a5a80e83 | |||
fa1cf7959d | |||
3a6ce860ad | |||
391b648c3c | |||
29c76102f4 | |||
d106010f42 | |||
635593f889 | |||
9cf4731013 | |||
5ce963bdb4 | |||
a763bec661 | |||
5d80234bd6 | |||
3ebd843458 |
9 changed files with 30 additions and 1581 deletions
|
@ -23,7 +23,7 @@
|
||||||
"argocd-init\\.yml$"
|
"argocd-init\\.yml$"
|
||||||
],
|
],
|
||||||
"matchStrings": [
|
"matchStrings": [
|
||||||
"\\s+repo:\\s(?<registryUrl>.*)\\n\\s+chart:\\s(?<depName>.*)\\n\\s+version:\\s(?<currentValue>.*)\\n"
|
"\\s+chart:\\s(?<depName>.*)\\n\\s+repo:\\s(?<registryUrl>.*)\\n\\s+version:\\s(?<currentValue>.*)\\n"
|
||||||
],
|
],
|
||||||
"datasourceTemplate": "helm"
|
"datasourceTemplate": "helm"
|
||||||
},
|
},
|
||||||
|
@ -35,8 +35,8 @@
|
||||||
],
|
],
|
||||||
"matchStrings": [
|
"matchStrings": [
|
||||||
"\\s+chart::\\s\\\"(?<depName>.*)\\\",",
|
"\\s+chart::\\s\\\"(?<depName>.*)\\\",",
|
||||||
"\\s+version::\\s\\\"(?<currentValue>.*)\\\",",
|
"\\s+repo::\\s\\\"(?<registryUrl>.*)\\\",",
|
||||||
"\\s+repo::\\s\\\"(?<registryUrl>.*)\\\","
|
"\\s+version::\\s\\\"(?<currentValue>.*)\\\","
|
||||||
],
|
],
|
||||||
"matchStringsStrategy": "combination",
|
"matchStringsStrategy": "combination",
|
||||||
"datasourceTemplate": "helm"
|
"datasourceTemplate": "helm"
|
||||||
|
@ -49,8 +49,8 @@
|
||||||
],
|
],
|
||||||
"matchStrings": [
|
"matchStrings": [
|
||||||
"\\s+chart::\\s\\\"(?<depName>.*)\\\",",
|
"\\s+chart::\\s\\\"(?<depName>.*)\\\",",
|
||||||
"\\s+\\\"version\\\":\\s\\\"(?<currentValue>.*)\\\",",
|
"\\s+repo::\\s\\\"(?<registryUrl>.*)\\\",",
|
||||||
"\\s+repo::\\s\\\"(?<registryUrl>.*)\\\","
|
"\\s+\\\"version\\\":\\s\\\"(?<currentValue>.*)\\\","
|
||||||
],
|
],
|
||||||
"matchStringsStrategy": "combination",
|
"matchStringsStrategy": "combination",
|
||||||
"datasourceTemplate": "helm"
|
"datasourceTemplate": "helm"
|
||||||
|
|
|
@ -11,11 +11,13 @@ metadata:
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
spec:
|
||||||
# do not change order! (needed for renovate)
|
# do not change order! (needed for renovate)
|
||||||
repo: https://argoproj.github.io/argo-helm
|
|
||||||
chart: argo-cd
|
chart: argo-cd
|
||||||
version: 5.51.6
|
repo: https://argoproj.github.io/argo-helm
|
||||||
|
version: 7.3.8
|
||||||
targetNamespace: argocd
|
targetNamespace: argocd
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
|
server:
|
||||||
|
replicas: 1
|
||||||
applicationSet:
|
applicationSet:
|
||||||
enabled: false
|
enabled: false
|
||||||
notifications:
|
notifications:
|
||||||
|
@ -30,13 +32,13 @@ metadata:
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
spec:
|
||||||
# do not change order! (needed for renovate)
|
# do not change order! (needed for renovate)
|
||||||
repo: https://argoproj.github.io/argo-helm
|
|
||||||
chart: argocd-apps
|
chart: argocd-apps
|
||||||
version: 1.4.1
|
repo: https://argoproj.github.io/argo-helm
|
||||||
|
version: 2.0.0
|
||||||
targetNamespace: argocd
|
targetNamespace: argocd
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
projects:
|
projects:
|
||||||
- name: baseline
|
baseline:
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
finalizers:
|
finalizers:
|
||||||
- resources-finalizer.argocd.argoproj.io
|
- resources-finalizer.argocd.argoproj.io
|
||||||
|
@ -49,8 +51,7 @@ spec:
|
||||||
- group: '*'
|
- group: '*'
|
||||||
kind: '*'
|
kind: '*'
|
||||||
applications:
|
applications:
|
||||||
- name: baseline
|
baseline:
|
||||||
namespace: argocd
|
|
||||||
project: baseline
|
project: baseline
|
||||||
finalizers:
|
finalizers:
|
||||||
- resources-finalizer.argocd.argoproj.io
|
- resources-finalizer.argocd.argoproj.io
|
||||||
|
|
|
@ -4,9 +4,11 @@ local app = import "../_templates/argocd_app.libsonnet";
|
||||||
app + {
|
app + {
|
||||||
chart:: "cert-manager",
|
chart:: "cert-manager",
|
||||||
repo:: "https://charts.jetstack.io",
|
repo:: "https://charts.jetstack.io",
|
||||||
version:: "1.13.*",
|
version:: "1.15.*",
|
||||||
values:: |||
|
values:: |||
|
||||||
installCRDs: true
|
crds:
|
||||||
|
enabled: true
|
||||||
|
keep: false
|
||||||
|||
|
|||
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
|
@ -4,7 +4,7 @@ local app = import "../_templates/argocd_app.libsonnet";
|
||||||
app + {
|
app + {
|
||||||
chart:: "ingress-nginx",
|
chart:: "ingress-nginx",
|
||||||
repo:: "https://kubernetes.github.io/ingress-nginx",
|
repo:: "https://kubernetes.github.io/ingress-nginx",
|
||||||
version:: "4.8.*",
|
version:: "4.11.*",
|
||||||
values:: |||
|
values:: |||
|
||||||
defaultBackend:
|
defaultBackend:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,39 +0,0 @@
|
||||||
local app = import "../../_templates/argocd_app.libsonnet";
|
|
||||||
|
|
||||||
[
|
|
||||||
app + {
|
|
||||||
name:: "loki",
|
|
||||||
namespace:: "metrics",
|
|
||||||
chart:: "loki-stack",
|
|
||||||
repo:: "https://grafana.github.io/helm-charts",
|
|
||||||
version:: "2.9.*",
|
|
||||||
syncOptions:: ["CreateNamespace=true", "Force=true"],
|
|
||||||
values:: |||
|
|
||||||
loki:
|
|
||||||
isDefault: false
|
|
||||||
promtail:
|
|
||||||
extraScrapeConfigs:
|
|
||||||
- job_name: journal
|
|
||||||
journal:
|
|
||||||
path: /var/log/journal
|
|
||||||
max_age: 12h
|
|
||||||
labels:
|
|
||||||
job: systemd-journal
|
|
||||||
relabel_configs:
|
|
||||||
- source_labels:
|
|
||||||
- '__journal__systemd_unit'
|
|
||||||
target_label: 'unit'
|
|
||||||
- source_labels:
|
|
||||||
- '__journal__hostname'
|
|
||||||
target_label: 'hostname'
|
|
||||||
extraVolumes:
|
|
||||||
- name: journal
|
|
||||||
hostPath:
|
|
||||||
path: /var/log/journal
|
|
||||||
extraVolumeMounts:
|
|
||||||
- name: journal
|
|
||||||
mountPath: /var/log/journal
|
|
||||||
readOnly: true
|
|
||||||
|||
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,47 +0,0 @@
|
||||||
# see https://blog.ediri.io/kube-prometheus-stack-and-argocd-23-how-to-remove-a-workaround
|
|
||||||
local app = import "../../_templates/argocd_app.libsonnet";
|
|
||||||
|
|
||||||
local vars = {
|
|
||||||
"version": "55.3.1",
|
|
||||||
"namespace": "metrics"
|
|
||||||
};
|
|
||||||
|
|
||||||
[
|
|
||||||
app + {
|
|
||||||
name:: "prometheus-crds",
|
|
||||||
namespace:: vars.namespace,
|
|
||||||
path:: "charts/kube-prometheus-stack/charts/crds/crds",
|
|
||||||
repo:: "https://github.com/prometheus-community/helm-charts.git",
|
|
||||||
version:: "kube-prometheus-stack-" + vars.version,
|
|
||||||
syncOptions:: ["CreateNamespace=true", "Replace=true"],
|
|
||||||
sync_wave:: -1,
|
|
||||||
},
|
|
||||||
app + {
|
|
||||||
name:: "prometheus-grafana",
|
|
||||||
namespace: vars.namespace,
|
|
||||||
chart:: "kube-prometheus-stack",
|
|
||||||
repo:: "https://prometheus-community.github.io/helm-charts",
|
|
||||||
version:: vars.version,
|
|
||||||
skipCrds:: true,
|
|
||||||
values:: |||
|
|
||||||
fullnameOverride: prometheus-stack
|
|
||||||
kubeProxy:
|
|
||||||
enabled: false
|
|
||||||
kubeScheduler:
|
|
||||||
enabled: false
|
|
||||||
kubeControllerManager:
|
|
||||||
enabled: false
|
|
||||||
alertmanager:
|
|
||||||
enabled: false
|
|
||||||
prometheus:
|
|
||||||
prometheusSpec:
|
|
||||||
storageSpec:
|
|
||||||
volumeClaimTemplate:
|
|
||||||
spec:
|
|
||||||
accessModes: ["ReadWriteOnce"]
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 10Gi
|
|
||||||
|||
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -5,8 +5,8 @@ app + {
|
||||||
name:: "zabbix-proxy",
|
name:: "zabbix-proxy",
|
||||||
namespace:: "monitoring",
|
namespace:: "monitoring",
|
||||||
chart:: "zabbix-helm-chrt",
|
chart:: "zabbix-helm-chrt",
|
||||||
repo:: "https://cdn.zabbix.com/zabbix/integrations/kubernetes-helm/6.4",
|
repo:: "https://cdn.zabbix.com/zabbix/integrations/kubernetes-helm/7.0",
|
||||||
version:: "1.3.*",
|
version:: "0.0.*",
|
||||||
values:: |||
|
values:: |||
|
||||||
zabbixAgent:
|
zabbixAgent:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
- hosts: all
|
- name: Install k3s server
|
||||||
|
hosts: all
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
name: Install k3s server
|
|
||||||
tags: k3s-server
|
tags: k3s-server
|
||||||
tasks:
|
tasks:
|
||||||
- name: Download k3s install script
|
- name: Download k3s install script
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
- name: Install k3s server
|
- name: Install k3s server
|
||||||
ansible.builtin.command: "k3s_install.sh"
|
ansible.builtin.command: "k3s_install.sh"
|
||||||
environment:
|
environment:
|
||||||
INSTALL_K3S_CHANNEL: v1.28.4+k3s1
|
INSTALL_K3S_CHANNEL: v1.30.2+k3s1
|
||||||
INSTALL_K3S_EXEC: "--disable traefik"
|
INSTALL_K3S_EXEC: "--disable traefik"
|
||||||
changed_when: false
|
changed_when: false
|
||||||
- name: Start and enable k3s server
|
- name: Start and enable k3s server
|
||||||
|
@ -20,15 +20,20 @@
|
||||||
name: k3s
|
name: k3s
|
||||||
state: started
|
state: started
|
||||||
enabled: true
|
enabled: true
|
||||||
|
- name: Add restart cronjob
|
||||||
|
ansible.builtin.cron:
|
||||||
|
name: "restart k3s (and regenerate certs if necessary)"
|
||||||
|
special_time: monthly
|
||||||
|
job: "systemctl restart k3s"
|
||||||
- name: Get kubeconfig
|
- name: Get kubeconfig
|
||||||
ansible.builtin.fetch:
|
ansible.builtin.fetch:
|
||||||
src: /etc/rancher/k3s/k3s.yaml
|
src: /etc/rancher/k3s/k3s.yaml
|
||||||
dest: kubeconfig_{{ ansible_host }}.yml
|
dest: kubeconfig_{{ ansible_host }}.yml
|
||||||
flat: true
|
flat: true
|
||||||
|
|
||||||
- hosts: all
|
- name: Deploy baseline
|
||||||
|
hosts: all
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
name: Deploy baseline
|
|
||||||
tags: baseline
|
tags: baseline
|
||||||
tasks:
|
tasks:
|
||||||
- name: Copy manifest
|
- name: Copy manifest
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue