diff --git a/apps/apps/halo/helmchart.yaml b/apps/apps/halo/helmchart.yaml index bf5525c..f23c01f 100644 --- a/apps/apps/halo/helmchart.yaml +++ b/apps/apps/halo/helmchart.yaml @@ -31,7 +31,7 @@ spec: - greenhk image: repository: halohub/halo-pro - tag: 2.20.12 + tag: 2.20.14 service: type: ClusterIP ingress: diff --git a/apps/infra/data/cloudnative-pg/helmchart.yaml b/apps/infra/data/cloudnative-pg/helmchart.yaml index 76a6622..0b732b9 100644 --- a/apps/infra/data/cloudnative-pg/helmchart.yaml +++ b/apps/infra/data/cloudnative-pg/helmchart.yaml @@ -7,7 +7,7 @@ spec: repo: https://cloudnative-pg.github.io/charts chart: cloudnative-pg targetNamespace: infra-data - version: 0.22.1 + version: 0.23.0 valuesContent: |- affinity: nodeAffinity: diff --git a/apps/infra/data/milvus/helmchart.yaml b/apps/infra/data/milvus/helmchart.yaml index bc4de4c..264bf86 100644 --- a/apps/infra/data/milvus/helmchart.yaml +++ b/apps/infra/data/milvus/helmchart.yaml @@ -7,7 +7,7 @@ spec: repo: https://zilliztech.github.io/milvus-helm/ chart: milvus targetNamespace: infra-data - version: 4.2.15 + version: 4.2.38 valuesContent: |- cluster: enabled: false diff --git a/apps/infra/data/redis/helmchart.yaml b/apps/infra/data/redis/helmchart.yaml index 3802999..7eba727 100644 --- a/apps/infra/data/redis/helmchart.yaml +++ b/apps/infra/data/redis/helmchart.yaml @@ -6,7 +6,7 @@ metadata: spec: chart: oci://registry-1.docker.io/bitnamicharts/redis targetNamespace: infra-data - version: 20.2.1 + version: 20.7.0 valuesContent: |- global: redis: diff --git a/apps/infra/devops/cert-manager/helmchart.yaml b/apps/infra/devops/cert-manager/helmchart.yaml index 30f616b..4981565 100644 --- a/apps/infra/devops/cert-manager/helmchart.yaml +++ b/apps/infra/devops/cert-manager/helmchart.yaml @@ -9,7 +9,7 @@ spec: repo: https://charts.jetstack.io chart: cert-manager targetNamespace: infra-devops - version: v1.16.2 + version: v1.17.0 valuesContent: |- affinity: nodeAffinity: diff --git a/apps/infra/devops/gitea/helmchart.yaml b/apps/infra/devops/gitea/helmchart.yaml index dcaf722..54d7a76 100644 --- a/apps/infra/devops/gitea/helmchart.yaml +++ b/apps/infra/devops/gitea/helmchart.yaml @@ -36,7 +36,7 @@ spec: postgresql-ha: enabled: false image: - tag: 1.22.6 + tag: 1.23.3 ingress: enabled: true className: nginx diff --git a/apps/infra/devops/velero/helmchart.yaml b/apps/infra/devops/velero/helmchart.yaml index b1a1849..131d46c 100644 --- a/apps/infra/devops/velero/helmchart.yaml +++ b/apps/infra/devops/velero/helmchart.yaml @@ -7,7 +7,7 @@ spec: repo: https://vmware-tanzu.github.io/helm-charts chart: velero targetNamespace: infra-devops - version: 8.1.0 + version: 8.3.0 valuesContent: |- affinity: nodeAffinity: diff --git a/apps/infra/monitor/loki/helmchart-loki.yaml b/apps/infra/monitor/loki/helmchart-loki.yaml index 1b377f3..3cb2eb3 100644 --- a/apps/infra/monitor/loki/helmchart-loki.yaml +++ b/apps/infra/monitor/loki/helmchart-loki.yaml @@ -7,7 +7,7 @@ spec: repo: https://grafana.github.io/helm-charts chart: loki targetNamespace: infra-monitor - version: 6.23.0 + version: 6.25.1 valuesContent: |- deploymentMode: SingleBinary gateway: diff --git a/apps/infra/monitor/prometheus/helmchart.yaml b/apps/infra/monitor/prometheus/helmchart.yaml index e69e719..f213338 100644 --- a/apps/infra/monitor/prometheus/helmchart.yaml +++ b/apps/infra/monitor/prometheus/helmchart.yaml @@ -7,7 +7,7 @@ spec: repo: https://prometheus-community.github.io/helm-charts chart: kube-prometheus-stack targetNamespace: infra-monitor - version: 66.4.0 + version: 69.2.0 valuesContent: |- kubeControllerManager: enabled: false diff --git a/apps/infra/net/nginx/helmchart.yaml b/apps/infra/net/nginx/helmchart.yaml index 95df65f..02d64d9 100644 --- a/apps/infra/net/nginx/helmchart.yaml +++ b/apps/infra/net/nginx/helmchart.yaml @@ -6,7 +6,7 @@ metadata: spec: repo: https://kubernetes.github.io/ingress-nginx chart: ingress-nginx - version: 4.11.3 + version: 4.12.0 targetNamespace: infra-net valuesContent: |- fullnameOverride: ingress-nginx @@ -30,6 +30,7 @@ spec: config: use-forwarded-headers: "true" allow-snippet-annotations: "true" + annotations-risk-level: Critical # http to https重定向 ssl-redirect: "true" # 自定义错误页面 @@ -105,7 +106,7 @@ spec: plugins: "crowdsec" lua-shared-dicts: "crowdsec_cache: 50m" # 启用geoip2模块 - maxmindLicenseKey: "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" + maxmindLicenseKey: "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" extraArgs: default-ssl-certificate: "infra-net/dev-cm-crt" # crowdsec插件配置 @@ -158,6 +159,18 @@ spec: registry: docker.io image: devcm/default-backend tag: v0.1.0 - # 和controller部署同一节点 - nodeSelector: - svccontroller.k3s.cattle.io/enablelb: "true" + autoscaling: + enabled: true + minReplicas: 1 + maxReplicas: 3 + targetCPUUtilizationPercentage: 80 + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: topology.kubernetes.io/region + operator: In + values: + - "cn-sh" + - "cn-hk" diff --git a/install/README.md b/install/README.md index 9bf1109..d2268c8 100644 --- a/install/README.md +++ b/install/README.md @@ -25,9 +25,9 @@ mkdir -p /etc/rancher/k3s && vim /etc/rancher/k3s/config.yaml ### 安装k3s 此处注意安装类型 是server 还是 agent ```shell curl -sfL https://get.k3s.io | \ - INSTALL_K3S_VERSION=v1.31.4+k3s1 \ + INSTALL_K3S_VERSION=v1.32.1+k3s1 \ INSTALL_K3S_MIRROR=cn \ - sh -s - server + sh -s - agent ``` ### 国内安装加速 & 镜像加速地址 diff --git a/install/master-init.config.yaml b/install/master-init.config.yaml index 679fc6c..6655461 100644 --- a/install/master-init.config.yaml +++ b/install/master-init.config.yaml @@ -3,6 +3,11 @@ cluster-init: true tls-san: - "k3s.dev.cm,k3s.fillcode.com" +# 数据相关 +etcd-snapshot-retention: "1" +etcd-snapshot-schedule-cron: "0 0 * * *" +etcd-snapshot-compress: true + # 网络相关 vpn-auth: "name=tailscale,joinKey=tskey-auth-kGPKhWTTQN11CNTRL-V3zxxhg5B9iwHut6guHw8iTrpHfwrwZ7" diff --git a/install/master.config.yaml b/install/master.config.yaml index 55ec155..1235186 100644 --- a/install/master.config.yaml +++ b/install/master.config.yaml @@ -4,6 +4,11 @@ token: "K1010dd6f0853e824cfaf417117f31a0d797a738aa2d4b9d01cd5972a9b084c81a0::ser tls-san: - "k3s.dev.cm,k3s.fillcode.com" +# 数据相关 +etcd-snapshot-retention: "1" +etcd-snapshot-schedule-cron: "0 0 * * *" +etcd-snapshot-compress: true + # 网络相关 vpn-auth: "name=tailscale,joinKey=tskey-auth-kwoYXmNbiJ11CNTRL-Pzx3Adi1dsLwhZWfSm2LsLQcmjk3UcLv" diff --git a/install/registries.yaml b/install/registries.yaml index 0038f94..fa9c885 100644 --- a/install/registries.yaml +++ b/install/registries.yaml @@ -8,3 +8,6 @@ mirrors: "registry.k8s.io": endpoint: - "k8s.m.daocloud.io" + "quay.io": + endpoint: + - "quay.m.daocloud.io"