diff --git a/_sys/descheduler-cronjob.yaml b/_sys/descheduler-cronjob.yaml index 8d86705..2504be2 100644 --- a/_sys/descheduler-cronjob.yaml +++ b/_sys/descheduler-cronjob.yaml @@ -5,7 +5,7 @@ metadata: name: descheduler-cronjob namespace: kube-system spec: - schedule: "*/15 * * * *" + schedule: "*/50 * * * *" concurrencyPolicy: "Forbid" jobTemplate: spec: diff --git a/_sys/descheduler-policy-configmap.yaml b/_sys/descheduler-policy-configmap.yaml index 477b520..8f6b542 100644 --- a/_sys/descheduler-policy-configmap.yaml +++ b/_sys/descheduler-policy-configmap.yaml @@ -7,7 +7,7 @@ data: policy.yaml: | apiVersion: "descheduler/v1alpha1" kind: "DeschedulerPolicy" - maxNoOfPodsToEvictPerNode: 3 + maxNoOfPodsToEvictPerNode: 1 strategies: "RemoveDuplicates": enabled: true diff --git a/apps/apt-cacher-ng/live-deployment.yaml b/apps/apt-cacher-ng/live-deployment.yaml index 55430cb..284db9e 100644 --- a/apps/apt-cacher-ng/live-deployment.yaml +++ b/apps/apt-cacher-ng/live-deployment.yaml @@ -76,9 +76,30 @@ kind: PersistentVolumeClaim metadata: name: apt-cacher-volume spec: - storageClassName: nfs-ssd + storageClassName: nfs-ssd-ebin02 + volumeName: apt-cacher-ng accessModes: - ReadWriteOnce resources: requests: storage: 40Gi +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: apt-cacher-ng +spec: + storageClassName: "nfs-ssd-ebin02" + nfs: + path: /data/raid1-ssd/k8s-data/apt-cacher-ng + server: ebin02 + capacity: + storage: 40Gi + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + persistentVolumeReclaimPolicy: Retain + claimRef: + kind: PersistentVolumeClaim + name: apt-cacher-volume + namespace: live-infra diff --git a/apps/gitea.yaml b/apps/gitea.yaml index 02bc533..99f4cfb 100644 --- a/apps/gitea.yaml +++ b/apps/gitea.yaml @@ -45,14 +45,22 @@ spec: value: gitea - name: DB_PASSWD value: giteaEu94XSS4gKpheSBoMsIs - - name: GITEA__indexer__ISSUE_INDEXER_TYPE - value: db + #- name: GITEA__indexer__ISSUE_INDEXER + #value: redis + #- name: GITEA__indexer__ISSUE_INDEXER_QUEUE_CONN_STR + #value: addrs=redis-standalone.live-env.svc.cluster.local:6379 db=1 + - name: GITEA__packages__ENABLED + value: "true" - name: GITEA__log__LEVEL - value: warn + value: trace - name: GITEA__log__MODE - value: console - - name: GITEA__queue__TYPE - value: persistable-channel + value: file + - name: GITEA__log__ROUTER + value: file + - name: GITEA__log__MACARON + value: file + #- name: GITEA__queue__TYPE + #value: redis #- name: GITEA__queue__CONN_STR #value: redis://redis-standalone.live-env.svc.cluster.local:6397/0 volumeMounts: @@ -65,18 +73,18 @@ spec: - name: ssh containerPort: 22 protocol : TCP - livenessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - httpGet: - path: / - port: http - readinessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - httpGet: - path: / - port: http + #livenessProbe: + # initialDelaySeconds: 300 + # periodSeconds: 10 + # httpGet: + # path: / + # port: http + #readinessProbe: + # initialDelaySeconds: 300 + # periodSeconds: 10 + # httpGet: + # path: / + # port: http resources: requests: memory: "300Mi" diff --git a/cluster-monitoring b/cluster-monitoring index f982c2a..3b453f9 160000 --- a/cluster-monitoring +++ b/cluster-monitoring @@ -1 +1 @@ -Subproject commit f982c2a477b8a722fe7f3aef086e65140dfda697 +Subproject commit 3b453f998f9d76602af31c03a86609249e1d06b5