From 30ba29091828bfc5e04387b4e300a1db9f56cf4a Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 10 Sep 2022 13:32:34 +0200 Subject: [PATCH] don't know why this shit doesn't run anymore --- apps/apt-cacher-ng/live-deployment.yaml | 23 ++++++++++- apps/gitea.yaml | 53 ++++++++++++++++++------- apps/postgresql-deploy.yaml | 2 +- apps/redis.yaml | 1 + 4 files changed, 63 insertions(+), 16 deletions(-) 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 e631e6c..aca280a 100644 --- a/apps/gitea.yaml +++ b/apps/gitea.yaml @@ -45,16 +45,20 @@ spec: value: gitea - name: DB_PASSWD value: giteaEu94XSS4gKpheSBoMsIs - - name: GITEA__indexer__ISSUE_INDEXER_TYPE - value: db + - name: GITEA__server__ROOT_URL + value: http://git-ui.lan/ + #- name: GITEA__indexer__ISSUE_INDEXER + # value: redis + #- name: GITEA__indexer__ISSUE_INDEXER_QUEUE_CONN_STR + # value: addrs=172.23.255.6:6379 db=1 - name: GITEA__log__LEVEL - value: warn + value: Warn - name: GITEA__log__MODE value: console - - name: GITEA__queue__TYPE - value: persistable-channel - #- name: GITEA__queue__CONN_STR - #value: redis://redis-standalone.live-env.svc.cluster.local:6397/0 + #- name: GITEA__queue__TYPE + # value: redis + #- name: GITEA__queue__CONN_STR + # value: redis://172.23.255.6:6379/0 volumeMounts: - name: gitea mountPath: /data @@ -66,13 +70,13 @@ spec: containerPort: 22 protocol : TCP livenessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - httpGet: - path: / - port: http + initialDelaySeconds: 300 + periodSeconds: 10 + httpGet: + path: / + port: http readinessProbe: - initialDelaySeconds: 30 + initialDelaySeconds: 300 periodSeconds: 10 httpGet: path: / @@ -96,7 +100,8 @@ metadata: labels: app: gitea spec: - storageClassName: nfs-ssd + storageClassName: nfs-ssd-ebin02 + volumeName: gitea accessModes: - ReadWriteOnce resources: @@ -104,6 +109,26 @@ spec: storage: 20Gi --- apiVersion: v1 +kind: PersistentVolume +metadata: + name: gitea +spec: + storageClassName: "nfs-ssd-ebin02" + nfs: + path: /data/raid1-ssd/k8s-data/gitea-data + server: ebin02 + capacity: + storage: 20Gi + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + persistentVolumeReclaimPolicy: Retain + claimRef: + kind: PersistentVolumeClaim + name: gitea + namespace: live-env +--- +apiVersion: v1 kind: Service metadata: name: gitea diff --git a/apps/postgresql-deploy.yaml b/apps/postgresql-deploy.yaml index ce1a1be..9fe32dc 100644 --- a/apps/postgresql-deploy.yaml +++ b/apps/postgresql-deploy.yaml @@ -49,7 +49,7 @@ spec: - key: app operator: In values: - - promtheus + - prometheus - loki topologyKey: kubernetes.io/hostname # - name: prometheus-exporter diff --git a/apps/redis.yaml b/apps/redis.yaml index a166f4e..f4949a9 100644 --- a/apps/redis.yaml +++ b/apps/redis.yaml @@ -5,6 +5,7 @@ metadata: namespace: live-env data: redis.conf: |- + bind * -::* appendonly yes maxmemory 5mb ---