From 51c9b2f07b0ef4535aebe404626de1b019267de1 Mon Sep 17 00:00:00 2001 From: zhenyus Date: Wed, 19 Mar 2025 15:52:35 +0800 Subject: [PATCH] chore: update inventory to comment out deprecated worker nodes and adjust Gitea resource limits Signed-off-by: zhenyus --- cluster/ansible/manifests/inventory.ini | 16 ++++++++-------- freeleaps/helm-pkg/3rd/gitea/values.prod.yaml | 12 +++++++++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cluster/ansible/manifests/inventory.ini b/cluster/ansible/manifests/inventory.ini index 486f7145..c9fcbc96 100644 --- a/cluster/ansible/manifests/inventory.ini +++ b/cluster/ansible/manifests/inventory.ini @@ -9,14 +9,14 @@ kube_control_plane ; If you want to add more nodes to the cluster, you can add them to the [kube_node] group [kube_node] ; Belows are the original nodes for the cluster, removed from cluster -prod-usw2-k8s-freeleaps-worker-ingress-01 ansible_host=10.10.0.6 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-ingress-01 -prod-usw2-k8s-freeleaps-worker-ingress-02 ansible_host=10.10.0.7 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-ingress-02 -prod-usw2-k8s-freeleaps-worker-ingress-03 ansible_host=10.10.0.5 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-ingress-03 -prod-usw2-k8s-freeleaps-worker-01 ansible_host=10.10.0.10 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-01 -prod-usw2-k8s-freeleaps-worker-02 ansible_host=10.10.0.11 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-02 -prod-usw2-k8s-freeleaps-worker-03 ansible_host=10.10.0.12 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-03 -prod-usw2-k8s-freeleaps-worker-04 ansible_host=10.10.0.13 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-04 -prod-usw2-k8s-freeleaps-worker-06 ansible_host=10.10.0.15 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-06 +; prod-usw2-k8s-freeleaps-worker-ingress-01 ansible_host=10.10.0.6 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-ingress-01 +; prod-usw2-k8s-freeleaps-worker-ingress-02 ansible_host=10.10.0.7 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-ingress-02 +; prod-usw2-k8s-freeleaps-worker-ingress-03 ansible_host=10.10.0.5 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-ingress-03 +; prod-usw2-k8s-freeleaps-worker-01 ansible_host=10.10.0.10 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-01 +; prod-usw2-k8s-freeleaps-worker-02 ansible_host=10.10.0.11 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-02 +; prod-usw2-k8s-freeleaps-worker-03 ansible_host=10.10.0.12 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-03 +; prod-usw2-k8s-freeleaps-worker-04 ansible_host=10.10.0.13 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-04 +; prod-usw2-k8s-freeleaps-worker-06 ansible_host=10.10.0.15 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-06 ; Belows are the newly added nodes for the cluster to reduce cost prod-usw2-k8s-freeleaps-worker-nodes-01 ansible_host=10.10.0.16 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-nodes-01 prod-usw2-k8s-freeleaps-worker-nodes-02 ansible_host=10.10.0.17 ansible_user=wwwadmin@mathmast.com host_name=prod-usw2-k8s-freeleaps-worker-nodes-02 diff --git a/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml b/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml index 57283972..77689fb2 100644 --- a/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml +++ b/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml @@ -92,7 +92,8 @@ containerSecurityContext: {} securityContext: {} ## @param podDisruptionBudget Pod disruption budget -podDisruptionBudget: {} +podDisruptionBudget: + minAvailable: 1 # maxUnavailable: 1 # minAvailable: 1 @@ -191,7 +192,12 @@ ingress: # ## @param resources Kubernetes resources resources: - {} + requests: + cpu: 200m + memory: 128Mi + limits: + cpu: 500m + memory: 1Gi # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -518,7 +524,7 @@ gitea: ## @param gitea.config.server.SSH_PORT SSH port for rootlful Gitea image ## @param gitea.config.server.SSH_LISTEN_PORT SSH port for rootless Gitea image config: - APP_NAME: "Freeleaps Codebase Service" + APP_NAME: "Freeleaps" # APP_NAME: "Gitea: Git with a cup of tea" # RUN_MODE: dev server: