Merge branch 'main' into renovate/quay.io-prometheus-alertmanager-main
This commit is contained in:
commit
f58c6b4ba3
11 changed files with 138 additions and 7 deletions
|
@ -10,7 +10,7 @@ spec:
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
chart: cert-manager
|
chart: cert-manager
|
||||||
version: v1.12.3
|
version: v1.13.1
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: HelmRepository
|
kind: HelmRepository
|
||||||
name: jetstack
|
name: jetstack
|
||||||
|
|
|
@ -10,7 +10,7 @@ spec:
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
chart: cert-manager-webhook-dnsimple
|
chart: cert-manager-webhook-dnsimple
|
||||||
version: 0.0.7
|
version: 0.0.8
|
||||||
interval: 30m
|
interval: 30m
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: HelmRepository
|
kind: HelmRepository
|
||||||
|
@ -33,3 +33,4 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: dnsimple-api-token
|
name: dnsimple-api-token
|
||||||
key: letsencrypt-email
|
key: letsencrypt-email
|
||||||
|
containerPort: 8443
|
||||||
|
|
60
kubernetes/apps/kube-system/cilium/app/helmrelease.yaml
Normal file
60
kubernetes/apps/kube-system/cilium/app/helmrelease.yaml
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
---
|
||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
|
||||||
|
apiVersion: helm.toolkit.fluxcd.io/v2beta1
|
||||||
|
kind: HelmRelease
|
||||||
|
metadata:
|
||||||
|
name: cilium
|
||||||
|
namespace: kube-system
|
||||||
|
spec:
|
||||||
|
interval: 30m
|
||||||
|
chart:
|
||||||
|
spec:
|
||||||
|
chart: cilium
|
||||||
|
version: 1.14.2
|
||||||
|
sourceRef:
|
||||||
|
kind: HelmRepository
|
||||||
|
name: cilium
|
||||||
|
namespace: flux-system
|
||||||
|
maxHistory: 2
|
||||||
|
install:
|
||||||
|
remediation:
|
||||||
|
retries: 3
|
||||||
|
upgrade:
|
||||||
|
cleanupOnFail: true
|
||||||
|
remediation:
|
||||||
|
retries: 3
|
||||||
|
uninstall:
|
||||||
|
keepHistory: false
|
||||||
|
values:
|
||||||
|
cluster:
|
||||||
|
name: valinor
|
||||||
|
id: 1
|
||||||
|
ipam:
|
||||||
|
mode: kubernetes
|
||||||
|
kubeProxyReplacement: true
|
||||||
|
securityContext:
|
||||||
|
capabilities:
|
||||||
|
ciliumAgent:
|
||||||
|
- CHOWN
|
||||||
|
- KILL
|
||||||
|
- NET_ADMIN
|
||||||
|
- NET_RAW
|
||||||
|
- IPC_LOCK
|
||||||
|
- SYS_ADMIN
|
||||||
|
- SYS_RESOURCE
|
||||||
|
- DAC_OVERRIDE
|
||||||
|
- FOWNER
|
||||||
|
- SETGID
|
||||||
|
- SETUID
|
||||||
|
cleanCiliumState:
|
||||||
|
- NET_ADMIN
|
||||||
|
- SYS_ADMIN
|
||||||
|
- SYS_RESOURCE
|
||||||
|
cgroup:
|
||||||
|
autoMount:
|
||||||
|
enabled: false
|
||||||
|
hostRoot: /sys/fs/cgroup
|
||||||
|
# Talos Kubeprism
|
||||||
|
k8sServiceHost: localhost
|
||||||
|
k8sServicePort: 7445
|
||||||
|
rollOutCiliumPods: true
|
17
kubernetes/apps/kube-system/cilium/ks.yaml
Normal file
17
kubernetes/apps/kube-system/cilium/ks.yaml
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
---
|
||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
|
||||||
|
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||||
|
kind: Kustomization
|
||||||
|
metadata:
|
||||||
|
name: cluster-apps-cilium
|
||||||
|
namespace: flux-system
|
||||||
|
spec:
|
||||||
|
interval: 30m
|
||||||
|
retryInterval: 1m
|
||||||
|
timeout: 5m
|
||||||
|
path: "./kubernetes/apps/kube-system/cilium/app"
|
||||||
|
prune: true
|
||||||
|
sourceRef:
|
||||||
|
kind: GitRepository
|
||||||
|
name: valinor
|
||||||
|
wait: false
|
|
@ -18,3 +18,8 @@ spec:
|
||||||
values:
|
values:
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
args:
|
||||||
|
- --kubelet-insecure-tls
|
||||||
|
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
|
||||||
|
- --kubelet-use-node-status-port
|
||||||
|
- --metric-resolution=15s
|
||||||
|
|
|
@ -201,7 +201,7 @@ spec:
|
||||||
enableAdminAPI: true
|
enableAdminAPI: true
|
||||||
walCompression: true
|
walCompression: true
|
||||||
thanos:
|
thanos:
|
||||||
image: quay.io/thanos/thanos:v0.32.3
|
image: quay.io/thanos/thanos:v0.32.4
|
||||||
objectStorageConfig:
|
objectStorageConfig:
|
||||||
name: thanos-s3-secret
|
name: thanos-s3-secret
|
||||||
key: objstore.yml
|
key: objstore.yml
|
||||||
|
|
|
@ -10,7 +10,7 @@ spec:
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
chart: prometheus-node-exporter
|
chart: prometheus-node-exporter
|
||||||
version: 4.23.1
|
version: 4.23.2
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: HelmRepository
|
kind: HelmRepository
|
||||||
name: prometheus-community
|
name: prometheus-community
|
||||||
|
|
|
@ -11,7 +11,7 @@ spec:
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
chart: thanos
|
chart: thanos
|
||||||
version: 12.13.5
|
version: 12.13.6
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: HelmRepository
|
kind: HelmRepository
|
||||||
name: bitnami
|
name: bitnami
|
||||||
|
@ -34,7 +34,7 @@ spec:
|
||||||
image:
|
image:
|
||||||
registry: quay.io
|
registry: quay.io
|
||||||
repository: thanos/thanos
|
repository: thanos/thanos
|
||||||
tag: v0.32.3
|
tag: v0.32.4
|
||||||
existingObjstoreSecret: thanos-s3-secret
|
existingObjstoreSecret: thanos-s3-secret
|
||||||
queryFrontend:
|
queryFrontend:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ansible==8.4.0
|
ansible==8.4.0
|
||||||
ansible-lint==6.20.0
|
ansible-lint==6.20.2
|
||||||
bcrypt==4.0.1
|
bcrypt==4.0.1
|
||||||
jmespath==1.0.1
|
jmespath==1.0.1
|
||||||
netaddr==0.9.0
|
netaddr==0.9.0
|
||||||
|
|
3
talos/clusterconfig/.gitignore
vendored
3
talos/clusterconfig/.gitignore
vendored
|
@ -2,3 +2,6 @@ valinor-aule.hsn.dev.yaml
|
||||||
valinor-eonwe.hsn.dev.yaml
|
valinor-eonwe.hsn.dev.yaml
|
||||||
valinor-arlen.hsn.dev.yaml
|
valinor-arlen.hsn.dev.yaml
|
||||||
talosconfig
|
talosconfig
|
||||||
|
valinor-vaire.hsn.dev.yaml
|
||||||
|
valinor-nienna.hsn.dev.yaml
|
||||||
|
valinor-orome.hsn.dev.yaml
|
||||||
|
|
|
@ -63,6 +63,51 @@ nodes:
|
||||||
- network: 10.2.0.0/16
|
- network: 10.2.0.0/16
|
||||||
gateway: 10.2.1.1 # The route's gateway (if empty, creates link scope route).
|
gateway: 10.2.1.1 # The route's gateway (if empty, creates link scope route).
|
||||||
metric: 2048
|
metric: 2048
|
||||||
|
- hostname: vaire.hsn.dev
|
||||||
|
disableSearchDomain: true
|
||||||
|
ipAddress: 10.2.0.8
|
||||||
|
controlPlane: false
|
||||||
|
installDiskSelector:
|
||||||
|
busPath: /dev/sda
|
||||||
|
networkInterfaces:
|
||||||
|
- interface: eth0
|
||||||
|
dhcp: true
|
||||||
|
- interface: eth1
|
||||||
|
dhcp: true
|
||||||
|
routes:
|
||||||
|
- network: 10.2.0.0/16
|
||||||
|
gateway: 10.2.1.1 # The route's gateway (if empty, creates link scope route).
|
||||||
|
metric: 2048
|
||||||
|
- hostname: nienna.hsn.dev
|
||||||
|
disableSearchDomain: true
|
||||||
|
ipAddress: 10.2.0.9
|
||||||
|
controlPlane: false
|
||||||
|
installDiskSelector:
|
||||||
|
busPath: /dev/sda
|
||||||
|
networkInterfaces:
|
||||||
|
- interface: eth0
|
||||||
|
dhcp: true
|
||||||
|
- interface: eth1
|
||||||
|
dhcp: true
|
||||||
|
routes:
|
||||||
|
- network: 10.2.0.0/16
|
||||||
|
gateway: 10.2.1.1 # The route's gateway (if empty, creates link scope route).
|
||||||
|
metric: 2048
|
||||||
|
- hostname: orome.hsn.dev
|
||||||
|
disableSearchDomain: true
|
||||||
|
ipAddress: 10.2.0.10
|
||||||
|
controlPlane: false
|
||||||
|
installDiskSelector:
|
||||||
|
busPath: /dev/sda
|
||||||
|
networkInterfaces:
|
||||||
|
- interface: eth0
|
||||||
|
dhcp: true
|
||||||
|
- interface: eth1
|
||||||
|
dhcp: true
|
||||||
|
routes:
|
||||||
|
- network: 10.2.0.0/16
|
||||||
|
gateway: 10.2.1.1 # The route's gateway (if empty, creates link scope route).
|
||||||
|
metric: 2048
|
||||||
|
|
||||||
controlPlane:
|
controlPlane:
|
||||||
patches:
|
patches:
|
||||||
|
|
Reference in a new issue