diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml index 793839f..972fc8a 100644 --- a/ansible/inventory/group_vars/all.yml +++ b/ansible/inventory/group_vars/all.yml @@ -12,7 +12,7 @@ ha_server_url: "{{ lookup('env', 'HA_SERVER_URL') | default('', true) }}" # ============================================ # K3s Server URL (优先使用 HA_SERVER_URL,否则动态使用 init 节点地址) k3s_server_url: "{{ ha_server_url if (ha_server_url | length > 0) else '' }}" -k3s_version: "v1.34.2+k3s1" +k3s_version: "v1.35.6+k3s1" tailscale_version: "1.96.4" # ETCD 配置 diff --git a/ansible/inventory/hosts.yml b/ansible/inventory/hosts.yml index 8dc969b..cfdab1c 100644 --- a/ansible/inventory/hosts.yml +++ b/ansible/inventory/hosts.yml @@ -108,11 +108,6 @@ all: node_hostname: homea node_region: cn-sh use_mirror: true - homeb: - ansible_host: homeb - node_hostname: homeb - node_region: cn-sh - use_mirror: true # 节点分组 k3s_cluster: diff --git a/flux/apps/helmrelease-halo.yaml b/flux/apps/helmrelease-halo.yaml index 87fd99b..2a751a0 100644 --- a/flux/apps/helmrelease-halo.yaml +++ b/flux/apps/helmrelease-halo.yaml @@ -18,7 +18,7 @@ spec: values: image: repository: halohub/halo-pro - tag: 2.25.3 + tag: 2.25.4 service: type: ClusterIP ingress: diff --git a/flux/flux-instance.yaml b/flux/flux-instance.yaml index ebf274d..c930186 100644 --- a/flux/flux-instance.yaml +++ b/flux/flux-instance.yaml @@ -5,7 +5,7 @@ metadata: namespace: infra-gitops spec: distribution: - version: "2.8.5" + version: "2.9.2" registry: "ghcr.io/fluxcd" artifact: "oci://ghcr.io/controlplaneio-fluxcd/flux-operator-manifests" components: diff --git a/flux/infrastructure/infra-gitops/helmrelease-gitea.yaml b/flux/infrastructure/infra-gitops/helmrelease-gitea.yaml index 106eab1..f82eaed 100644 --- a/flux/infrastructure/infra-gitops/helmrelease-gitea.yaml +++ b/flux/infrastructure/infra-gitops/helmrelease-gitea.yaml @@ -21,7 +21,7 @@ spec: postgresql-ha: enabled: false image: - tag: 1.26.2 + tag: 1.27.0 ingress: enabled: true className: nginx diff --git a/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml b/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml index cae9ff0..193ad92 100644 --- a/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml +++ b/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml @@ -21,6 +21,7 @@ spec: enabled: true statefulset: runner: + tag: 2.0.1 config: | log: level: info diff --git a/helmcharts/helmchart-flux.yaml b/helmcharts/helmchart-flux.yaml index 7436f9a..b72f7f7 100644 --- a/helmcharts/helmchart-flux.yaml +++ b/helmcharts/helmchart-flux.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator targetNamespace: infra-gitops - version: 0.48.0 + version: 0.55.0 valuesContent: |- affinity: nodeAffinity: