Compare commits
1 Commits
main
..
5177724fe4
| Author | SHA1 | Date | |
|---|---|---|---|
|
5177724fe4
|
@@ -2,7 +2,7 @@ version: "3.8"
|
|||||||
services:
|
services:
|
||||||
discovery:
|
discovery:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: ghcr.io/siderolabs/discovery-service:v1.0.17
|
image: ghcr.io/siderolabs/discovery-service:v1.0.15
|
||||||
ports:
|
ports:
|
||||||
- 10.105.6.215:3000:3000
|
- 10.105.6.215:3000:3000
|
||||||
- 10.105.6.215:3001:3001
|
- 10.105.6.215:3001:3001
|
||||||
@@ -5,7 +5,7 @@ services:
|
|||||||
command: tunnel run weyma-vault
|
command: tunnel run weyma-vault
|
||||||
env_file: ".env"
|
env_file: ".env"
|
||||||
vault:
|
vault:
|
||||||
image: hashicorp/vault:2.0
|
image: hashicorp/vault:1.21
|
||||||
env_file: ".env.vault"
|
env_file: ".env.vault"
|
||||||
environment:
|
environment:
|
||||||
VAULT_ADDR: "https://weyma-vault.infra.dubyatp.xyz:8200"
|
VAULT_ADDR: "https://weyma-vault.infra.dubyatp.xyz:8200"
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
kind: Cluster
|
kind: Cluster
|
||||||
name: weyma-talos
|
name: weyma-talos
|
||||||
kubernetes:
|
kubernetes:
|
||||||
version: v1.35.4
|
version: v1.34.2
|
||||||
talos:
|
talos:
|
||||||
version: v1.12.7
|
version: v1.11.5
|
||||||
features:
|
features:
|
||||||
backupConfiguration:
|
backupConfiguration:
|
||||||
interval: 6h0m0s
|
interval: 6h0m0s
|
||||||
@@ -332,7 +332,7 @@ kind: ControlPlane
|
|||||||
machines:
|
machines:
|
||||||
- 20b4c826-e699-43b3-826d-73eb5173680b
|
- 20b4c826-e699-43b3-826d-73eb5173680b
|
||||||
- 5fdea709-56ad-45f2-966d-5e344dbe4fdf
|
- 5fdea709-56ad-45f2-966d-5e344dbe4fdf
|
||||||
- 30303031-3030-3030-6335-303731636600
|
- 30303031-3030-3030-6335-303731636665
|
||||||
---
|
---
|
||||||
kind: Workers
|
kind: Workers
|
||||||
machines:
|
machines:
|
||||||
@@ -427,9 +427,9 @@ patches:
|
|||||||
interface: br0
|
interface: br0
|
||||||
---
|
---
|
||||||
kind: Machine
|
kind: Machine
|
||||||
name: 30303031-3030-3030-6335-303731636600
|
name: 30303031-3030-3030-6335-303731636665
|
||||||
patches:
|
patches:
|
||||||
- idOverride: 400-cm-30303031-3030-3030-6335-303731636600
|
- idOverride: 400-cm-30303031-3030-3030-6335-303731636665
|
||||||
inline:
|
inline:
|
||||||
machine:
|
machine:
|
||||||
network:
|
network:
|
||||||
|
|||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: argo-cd
|
- name: argo-cd
|
||||||
version: 9.5.17
|
version: 9.4.10
|
||||||
repository: https://argoproj.github.io/argo-helm
|
repository: https://argoproj.github.io/argo-helm
|
||||||
@@ -131,7 +131,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: admin.password
|
- secretKey: admin.password
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd
|
key: argo-cd
|
||||||
@@ -139,7 +138,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: admin.passwordMtime
|
- secretKey: admin.passwordMtime
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd
|
key: argo-cd
|
||||||
@@ -147,7 +145,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: dex.authentik.clientSecret
|
- secretKey: dex.authentik.clientSecret
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd
|
key: argo-cd
|
||||||
@@ -155,7 +152,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- apiVersion: external-secrets.io/v1
|
- apiVersion: external-secrets.io/v1
|
||||||
kind: ExternalSecret
|
kind: ExternalSecret
|
||||||
metadata:
|
metadata:
|
||||||
@@ -179,7 +175,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: type
|
- secretKey: type
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -187,7 +182,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: url
|
- secretKey: url
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -195,7 +189,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- apiVersion: external-secrets.io/v1
|
- apiVersion: external-secrets.io/v1
|
||||||
kind: ExternalSecret
|
kind: ExternalSecret
|
||||||
metadata:
|
metadata:
|
||||||
@@ -219,7 +212,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: type
|
- secretKey: type
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -227,7 +219,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: url
|
- secretKey: url
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -235,7 +226,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- apiVersion: external-secrets.io/v1
|
- apiVersion: external-secrets.io/v1
|
||||||
kind: ExternalSecret
|
kind: ExternalSecret
|
||||||
metadata:
|
metadata:
|
||||||
@@ -259,7 +249,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: type
|
- secretKey: type
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -267,7 +256,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: url
|
- secretKey: url
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -275,7 +263,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- apiVersion: external-secrets.io/v1
|
- apiVersion: external-secrets.io/v1
|
||||||
kind: ExternalSecret
|
kind: ExternalSecret
|
||||||
metadata:
|
metadata:
|
||||||
@@ -299,7 +286,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: type
|
- secretKey: type
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -307,7 +293,6 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
- secretKey: url
|
- secretKey: url
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: argo-cd-git
|
key: argo-cd-git
|
||||||
@@ -315,4 +300,3 @@ argo-cd:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: cert-manager
|
- name: cert-manager
|
||||||
version: v1.20.2
|
version: v1.19.4
|
||||||
repository: https://charts.jetstack.io
|
repository: https://charts.jetstack.io
|
||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: external-secrets
|
- name: external-secrets
|
||||||
version: 2.5.0
|
version: 2.1.0
|
||||||
repository: https://charts.external-secrets.io
|
repository: https://charts.external-secrets.io
|
||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: kite
|
- name: kite
|
||||||
version: 0.12.2
|
version: 0.8.0
|
||||||
repository: https://zxh326.github.io/kite
|
repository: https://zxh326.github.io/kite
|
||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: metallb
|
- name: metallb
|
||||||
version: 0.16.1
|
version: 0.15.3
|
||||||
repository: https://metallb.github.io/metallb
|
repository: https://metallb.github.io/metallb
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
metallb:
|
metallb:
|
||||||
frrk8s:
|
|
||||||
enabled: false
|
|
||||||
prometheus:
|
prometheus:
|
||||||
rbacPrometheus: false
|
rbacPrometheus: false
|
||||||
podMonitor:
|
podMonitor:
|
||||||
|
|||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: kube-prometheus-stack
|
- name: kube-prometheus-stack
|
||||||
version: 86.1.0
|
version: 82.10.3
|
||||||
repository: https://prometheus-community.github.io/helm-charts
|
repository: https://prometheus-community.github.io/helm-charts
|
||||||
@@ -17,6 +17,5 @@ spec:
|
|||||||
conversionStrategy: Default
|
conversionStrategy: Default
|
||||||
decodingStrategy: None
|
decodingStrategy: None
|
||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
nullBytePolicy: Ignore
|
|
||||||
key: monitoring
|
key: monitoring
|
||||||
property: discord_webhook
|
property: discord_webhook
|
||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: rook-ceph
|
- name: rook-ceph
|
||||||
version: v1.19.6
|
version: v1.19.2
|
||||||
repository: https://charts.rook.io/release
|
repository: https://charts.rook.io/release
|
||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: traefik
|
- name: traefik
|
||||||
version: 40.2.0
|
version: 39.0.5
|
||||||
repository: https://traefik.github.io/charts
|
repository: https://traefik.github.io/charts
|
||||||
@@ -37,7 +37,7 @@ traefik:
|
|||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
additionalContainers:
|
additionalContainers:
|
||||||
- name: cloudflared
|
- name: cloudflared
|
||||||
image: cloudflare/cloudflared:2026.5.2
|
image: cloudflare/cloudflared:2026.3.0
|
||||||
command:
|
command:
|
||||||
- cloudflared
|
- cloudflared
|
||||||
- tunnel
|
- tunnel
|
||||||
|
|||||||
@@ -24,5 +24,5 @@ appVersion: "1.0"
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: velero
|
- name: velero
|
||||||
version: 12.0.2
|
version: 11.4.0
|
||||||
repository: https://vmware-tanzu.github.io/helm-charts
|
repository: https://vmware-tanzu.github.io/helm-charts
|
||||||
@@ -59,7 +59,7 @@ velero:
|
|||||||
insecureSkipTLSVerify: "true"
|
insecureSkipTLSVerify: "true"
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: velero-plugin-for-aws
|
- name: velero-plugin-for-aws
|
||||||
image: velero/velero-plugin-for-aws:v1.14.1
|
image: velero/velero-plugin-for-aws:v1.14.0
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /target
|
- mountPath: /target
|
||||||
|
|||||||
Reference in New Issue
Block a user