diff --git a/flux/apps/helmrelease-halo.yaml b/flux/apps/helmrelease-halo.yaml index 9556764..0d32111 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.23.1 + tag: 2.24.0 service: type: ClusterIP ingress: diff --git a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml index 43eeddb..a7cfcbf 100644 --- a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml +++ b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml @@ -18,20 +18,6 @@ spec: value: when_required - name: AWS_RESPONSE_CHECKSUM_VALIDATION value: when_required - # >>> RECOVERY: 迁移完成后删除 bootstrap + externalClusters 段 <<< - bootstrap: - recovery: - source: recovery-source-hk - recoveryTarget: - targetTime: "2026-04-13 00:00:01.000000+00" - externalClusters: - - name: recovery-source-hk - plugin: - name: barman-cloud.cloudnative-pg.io - parameters: - barmanObjectName: cnpg17-objectstore-hw - serverName: cnpg17-cluster-hk - # <<< END RECOVERY >>> plugins: - name: barman-cloud.cloudnative-pg.io isWALArchiver: true diff --git a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml index 4009c94..0d21e2a 100644 --- a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml +++ b/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml @@ -18,20 +18,6 @@ spec: value: when_required - name: AWS_RESPONSE_CHECKSUM_VALIDATION value: when_required - # >>> RECOVERY: 迁移完成后删除 bootstrap + externalClusters 段 <<< - bootstrap: - recovery: - source: recovery-source-sh - recoveryTarget: - targetTime: "2026-04-13 00:00:01.000000+00" - externalClusters: - - name: recovery-source-sh - plugin: - name: barman-cloud.cloudnative-pg.io - parameters: - barmanObjectName: cnpg17-objectstore-hw - serverName: cnpg17-cluster-sh - # <<< END RECOVERY >>> plugins: - name: barman-cloud.cloudnative-pg.io isWALArchiver: true diff --git a/flux/infrastructure/infra-monitor/post/helmrelease-promtail.yaml b/flux/infrastructure/infra-monitor/post/helmrelease-promtail.yaml index 437b53b..6571cb7 100644 --- a/flux/infrastructure/infra-monitor/post/helmrelease-promtail.yaml +++ b/flux/infrastructure/infra-monitor/post/helmrelease-promtail.yaml @@ -5,6 +5,7 @@ metadata: namespace: infra-monitor spec: interval: 30m + timeout: 15m dependsOn: - name: loki chart: