diff --git a/apps/gitea.yaml b/apps/gitea.yaml index 61649fa..2e158c0 100644 --- a/apps/gitea.yaml +++ b/apps/gitea.yaml @@ -1,3 +1,7 @@ +#we use postgresql: +#create database gitea; +#create user gitea with encrypted password 'secret'; +#grant all privileges on database gitea to gitea; apiVersion: apps/v1 kind: Deployment metadata: @@ -46,13 +50,13 @@ spec: httpGet: path: / port: http -# resources: -# requests: -# memory: "256Mi" -# cpu: "250m" -# limits: -# memory: "1000Mi" -# cpu: "500m" + resources: + requests: + memory: "256Mi" + cpu: "250m" + limits: + memory: "1000Mi" + cpu: "500m" volumes: - name: gitea persistentVolumeClaim: @@ -78,14 +82,14 @@ metadata: name: gitea labels: app: gitea - release: latest spec: + type: LoadBalancer ports: - port: 3000 targetPort: http protocol: TCP name: http - - port: 2222 + - port: 22 targetPort: 22 name: ssh selector: @@ -98,7 +102,7 @@ metadata: name: gitea spec: rules: - - host: git.lan + - host: git-ui.lan http: paths: - backend: diff --git a/apps/postgresql/postgresql-deploy.yaml b/apps/postgresql/postgresql-deploy.yaml new file mode 100644 index 0000000..97d015c --- /dev/null +++ b/apps/postgresql/postgresql-deploy.yaml @@ -0,0 +1,74 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: postgres + labels: + app: postgres + env: live +spec: + selector: + matchLabels: + app: postgres + env: live + serviceName: postgres-service + replicas: 1 + template: + metadata: + labels: + app: postgres + env: live + spec: + containers: + - name: postgres + image: postgres + volumeMounts: + - name: postgres-disk + mountPath: /var/lib/postgresql/data + env: + - name: POSTGRES_PASSWORD + value: pg2020 + - name: PGDATA + value: /var/lib/postgresql/data/pgdata + volumes: + - name: postgres-disk + persistentVolumeClaim: + claimName: postgres +# volumeClaimTemplates: +# - metadata: +# name: postgres-disk +# spec: +# accessModes: +# - ReadWriteOnce +# resources: +# requests: +# storage: 10Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: postgres + labels: + app: postgres +spec: + storageClassName: nfs-ssd + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 20Mi +# service.yml +--- +apiVersion: v1 +kind: Service +metadata: + name: postgres + labels: + app: postgres + env: live +spec: + selector: + env: live + type: LoadBalancer + ports: + - port: 5432 + targetPort: 5432 \ No newline at end of file diff --git a/cluster-monitoring b/cluster-monitoring index 94678da..f0581d4 160000 --- a/cluster-monitoring +++ b/cluster-monitoring @@ -1 +1 @@ -Subproject commit 94678da245bcbbae489eb29ca020a20036a84faa +Subproject commit f0581d44d4990145e9e4dec615a9d77781560da4