diff --git a/_sys/descheduler-policy-configmap.yaml b/_sys/descheduler-policy-configmap.yaml index 16ddb58..477b520 100644 --- a/_sys/descheduler-policy-configmap.yaml +++ b/_sys/descheduler-policy-configmap.yaml @@ -7,6 +7,7 @@ data: policy.yaml: | apiVersion: "descheduler/v1alpha1" kind: "DeschedulerPolicy" + maxNoOfPodsToEvictPerNode: 3 strategies: "RemoveDuplicates": enabled: true diff --git a/apps/gitea.yaml b/apps/gitea.yaml index d114f31..fe1270e 100644 --- a/apps/gitea.yaml +++ b/apps/gitea.yaml @@ -11,6 +11,8 @@ metadata: release: latest spec: replicas: 1 + strategy: + type: Recreate selector: matchLabels: app: gitea @@ -24,7 +26,6 @@ spec: containers: - name: gitea image: gitea/gitea:latest - imagePullPolicy: Always env: - name: USER_UID value: "1000" @@ -32,6 +33,8 @@ spec: value: "1000" - name: TZ value: "Europe/Berlin" + - name: GITEA__lfs__PATH + value: /data/git/lfs - name: DB_TYPE value: postgres - name: DB_HOST @@ -42,6 +45,16 @@ spec: value: gitea - name: DB_PASSWD value: giteaEu94XSS4gKpheSBoMsIs + - name: GITEA__indexer__ISSUE_INDEXER_TYPE + value: db + - name: GITEA__log__LEVEL + 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 volumeMounts: - name: gitea mountPath: /data @@ -53,20 +66,24 @@ spec: containerPort: 22 protocol : TCP livenessProbe: + initialDelaySeconds: 30 + periodSeconds: 10 httpGet: path: / port: http readinessProbe: + initialDelaySeconds: 30 + periodSeconds: 10 httpGet: path: / port: http - resources: - requests: - memory: "200Mi" - cpu: "150m" - limits: - memory: "312Mi" - cpu: "500m" + #resources: + # requests: + # memory: "300Mi" + # cpu: "150m" + # limits: + # memory: "512Mi" + # cpu: "1000m" volumes: - name: gitea persistentVolumeClaim: diff --git a/apps/redis.yaml b/apps/redis.yaml new file mode 100644 index 0000000..a166f4e --- /dev/null +++ b/apps/redis.yaml @@ -0,0 +1,102 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: redis-cm + namespace: live-env +data: + redis.conf: |- + appendonly yes + maxmemory 5mb +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: redis-standalone + namespace: live-env +spec: + serviceName: redis-standalone + replicas: 1 + selector: + matchLabels: + app: redis-standalone + template: + metadata: + labels: + app: redis-standalone + spec: + containers: + - name: redis-standalone + image: redis + command: ["redis-server"] + args: ["/usr/local/etc/redis/redis.conf"] + resources: + limits: + memory: "128Mi" + cpu: "50m" + ports: + - containerPort: 6379 + volumeMounts: + - name: redis-standalone-pv + mountPath: /data + - name: config + mountPath: /usr/local/etc/redis + volumes: + - name: config + configMap: + name: redis-cm + - name: redis-standalone-pv + persistentVolumeClaim: + claimName: redis-standalone-pv + +--- +apiVersion: v1 +kind: Service +metadata: + name: redis-standalone + labels: + app: redis-standalone + env: live-env +spec: + selector: + env: live-env + type: LoadBalancer + loadBalancerIP: 172.23.255.6 + ports: + - name: redis-standalone + port: 6379 + targetPort: 6379 +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: redis-standalone-pv + labels: + app: redis-stndalone +spec: + storageClassName: nfs-ssd-ebin02 + volumeName: redis-standalone-pv + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: redis-standalone-pv +spec: + storageClassName: "nfs-ssd-ebin02" + nfs: + path: /data/raid1-ssd/k8s-data/redis-standalone-pv + server: ebin02 + capacity: + storage: 100Mi + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + persistentVolumeReclaimPolicy: Retain + claimRef: + kind: PersistentVolumeClaim + name: redis-standalone-pv + namespace: live-env \ No newline at end of file diff --git a/cluster-monitoring-local/additional-scrape-configs.yaml b/cluster-monitoring-local/additional-scrape-configs.yaml index bb5141e..469d2aa 100644 --- a/cluster-monitoring-local/additional-scrape-configs.yaml +++ b/cluster-monitoring-local/additional-scrape-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0CiAgICAtIG1xdHQuY2hhb3M6OTIzNAotIGpvYl9uYW1lOiBoYXByb3h5CiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBhZG0wMS53a3M6OTEwMQogICAgLSBkcnVja2kud2tzOjkxMDEKICAgIC0gYXV0bzAyLmNoYW9zOjkxMDEKLSBqb2JfbmFtZToga2xpcHBlcgogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczozOTAzCi0gam9iX25hbWU6IG9jdG9wcmludAogIG1ldHJpY3NfcGF0aDogL3BsdWdpbi9wcm9tZXRoZXVzX2V4cG9ydGVyL21ldHJpY3MKICBwYXJhbXM6CiAgICBhcGlrZXk6CiAgICAtIDMwRThCMDFCRkQ2NzRFNUJCRDQ0NkQwOEM0NzMwREY0CiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kud2tzOjgwCi0gam9iX25hbWU6IGhhc3NpbwogIG1ldHJpY3NfcGF0aDogL2FwaS9wcm9tZXRoZXVzCiAgYmVhcmVyX3Rva2VuOiAnZXlKMGVYQWlPaUpLVjFRaUxDSmhiR2NpT2lKSVV6STFOaUo5LmV5SnBjM01pT2lKaE16Qm1ZalUxWmpjeVpHRTBZemMyWW1VMk5tWTBOamxqTlRBeU1qZGpaQ0lzSW1saGRDSTZNVFl4TWpnNE16STVOeXdpWlhod0lqb3hPVEk0TWpRek1qazNmUS4xSUNzSGxpVVhSMENHNEg4dlFSWUo1alZxRndtcUtTQjBmU2NTaXRDLVE0JwogIHN0YXRpY19jb25maWdzOgogICAgLSB0YXJnZXRzOgogICAgICAtIGhhc3Npby5sYW46ODAKLSBqb2JfbmFtZTogaGFzc2lvX3Jpbmc4NgogIG1ldHJpY3NfcGF0aDogL2FwaS9wcm9tZXRoZXVzCiAgYmVhcmVyX3Rva2VuOiAnZXlKMGVYQWlPaUpLVjFRaUxDSmhiR2NpT2lKSVV6STFOaUo5LmV5SnBjM01pT2lJME9HRmpaVEppTm1RM09UZzBNamMzWVdGbU1tTm1abVUxWXpjNE5URTBOQ0lzSW1saGRDSTZNVFl4TWpFNU1qazBNQ3dpWlhod0lqb3hPVEkzTlRVeU9UUXdmUS5CYklBWG05UnEwamI2b3VxZ1ZITmQ2S2VlejNOUDN5aC03d3lmdW9COFlrJwogIHN0YXRpY19jb25maWdzOgogICAgLSB0YXJnZXRzOgogICAgICAtIGF1dG8uY2hhb3M6ODAKLSBqb2JfbmFtZTogcG9zdGdyZXMKICBzdGF0aWNfY29uZmlnczoKICAgIC0gdGFyZ2V0czoKICAgICAgLSBwb3N0Z3Jlcy5saXZlLWVudi5zdmMuY2x1c3Rlci5sb2NhbDo5MTg3Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGFkbTAxLndrczo5MTAwCiAgICAtIGR1bW9udC13a3Mud2tzOjkxMDAKICAgIC0gZHJ1Y2tpLndrczo5MTAwCiAgICAtIGViaW4wMS53a3M6OTEwMAogICAgLSBlYmluMDIud2tzOjkxMDAKICAgIC0gb3NtYy53a3M6OTEwMAogICAgLSByaW90MDEud2tzOjkxMDAKICAgIC0gdHJ1aGUuY2hhb3M6OTEwMAogICAgLSBhdXRvMDIuY2hhb3M6OTEwMAogICAgLSBkdW1vbnQuY2hhb3M6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56LmNoYW9zOjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg== + prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0CiAgICAtIG1xdHQuY2hhb3M6OTIzNAotIGpvYl9uYW1lOiBoYXByb3h5CiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBhZG0wMS53a3M6OTEwMQogICAgLSBkcnVja2kud2tzOjkxMDEKICAgIC0gYXV0bzAxLmNoYW9zOjkxMDEKICAgIC0gYXV0bzAyLmNoYW9zOjkxMDEKLSBqb2JfbmFtZToga2xpcHBlcgogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczozOTAzCi0gam9iX25hbWU6IG9jdG9wcmludAogIG1ldHJpY3NfcGF0aDogL3BsdWdpbi9wcm9tZXRoZXVzX2V4cG9ydGVyL21ldHJpY3MKICBwYXJhbXM6CiAgICBhcGlrZXk6CiAgICAtIDMwRThCMDFCRkQ2NzRFNUJCRDQ0NkQwOEM0NzMwREY0CiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kud2tzOjgwCi0gam9iX25hbWU6IGhhc3NpbwogIG1ldHJpY3NfcGF0aDogL2FwaS9wcm9tZXRoZXVzCiAgYmVhcmVyX3Rva2VuOiAnZXlKMGVYQWlPaUpLVjFRaUxDSmhiR2NpT2lKSVV6STFOaUo5LmV5SnBjM01pT2lKaE16Qm1ZalUxWmpjeVpHRTBZemMyWW1VMk5tWTBOamxqTlRBeU1qZGpaQ0lzSW1saGRDSTZNVFl4TWpnNE16STVOeXdpWlhod0lqb3hPVEk0TWpRek1qazNmUS4xSUNzSGxpVVhSMENHNEg4dlFSWUo1alZxRndtcUtTQjBmU2NTaXRDLVE0JwogIHN0YXRpY19jb25maWdzOgogICAgLSB0YXJnZXRzOgogICAgICAtIGhhc3Npby5sYW46ODAKLSBqb2JfbmFtZTogaGFzc2lvX3Jpbmc4NgogIG1ldHJpY3NfcGF0aDogL2FwaS9wcm9tZXRoZXVzCiAgYmVhcmVyX3Rva2VuOiAnZXlKMGVYQWlPaUpLVjFRaUxDSmhiR2NpT2lKSVV6STFOaUo5LmV5SnBjM01pT2lJME9HRmpaVEppTm1RM09UZzBNamMzWVdGbU1tTm1abVUxWXpjNE5URTBOQ0lzSW1saGRDSTZNVFl4TWpFNU1qazBNQ3dpWlhod0lqb3hPVEkzTlRVeU9UUXdmUS5CYklBWG05UnEwamI2b3VxZ1ZITmQ2S2VlejNOUDN5aC03d3lmdW9COFlrJwogIHN0YXRpY19jb25maWdzOgogICAgLSB0YXJnZXRzOgogICAgICAtIGF1dG8uY2hhb3M6ODAKLSBqb2JfbmFtZTogcG9zdGdyZXMKICBzdGF0aWNfY29uZmlnczoKICAgIC0gdGFyZ2V0czoKICAgICAgLSBwb3N0Z3Jlcy5saXZlLWVudi5zdmMuY2x1c3Rlci5sb2NhbDo5MTg3Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGFkbTAxLndrczo5MTAwCiAgICAtIGR1bW9udC13a3Mud2tzOjkxMDAKICAgIC0gZHJ1Y2tpLndrczo5MTAwCiAgICAtIGViaW4wMS53a3M6OTEwMAogICAgLSBlYmluMDIud2tzOjkxMDAKICAgIC0gb3NtYy53a3M6OTEwMAogICAgLSByaW90MDEud2tzOjkxMDAKICAgIC0gdHJ1aGUuY2hhb3M6OTEwMAogICAgLSBhdXRvMDEuY2hhb3M6OTEwMAogICAgLSBhdXRvMDIuY2hhb3M6OTEwMAogICAgLSBkdW1vbnQuY2hhb3M6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56LmNoYW9zOjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg== kind: Secret metadata: creationTimestamp: null diff --git a/cluster-monitoring-local/prometheus-additional.yaml b/cluster-monitoring-local/prometheus-additional.yaml index f5508b5..e2571f1 100644 --- a/cluster-monitoring-local/prometheus-additional.yaml +++ b/cluster-monitoring-local/prometheus-additional.yaml @@ -16,6 +16,7 @@ - targets: - adm01.wks:9101 - drucki.wks:9101 + - auto01.chaos:9101 - auto02.chaos:9101 - job_name: klipper static_configs: @@ -56,6 +57,7 @@ - osmc.wks:9100 - riot01.wks:9100 - truhe.chaos:9100 + - auto01.chaos:9100 - auto02.chaos:9100 - dumont.chaos:9100 - tumor.chaos:9100