diff --git a/_deploy/k8s/deployment.yaml b/_deploy/k8s/deployment.yaml index 6199fc5..9b1c441 100644 --- a/_deploy/k8s/deployment.yaml +++ b/_deploy/k8s/deployment.yaml @@ -7,7 +7,7 @@ spec: replicas: 1 selector: matchLabels: - app: telegram-listener + app: telegram-listener template: metadata: labels: @@ -27,22 +27,22 @@ spec: valueFrom: secretKeyRef: name: rmqc-default-user - key: host + key: host - name: ASPNETCORE_rmqc_username valueFrom: secretKeyRef: name: rmqc-default-user - key: username + key: username - name: ASPNETCORE_rmqc_password valueFrom: secretKeyRef: name: rmqc-default-user - key: password + key: password - name: ASPNETCORE_rmqc_port valueFrom: secretKeyRef: name: rmqc-default-user - key: port + key: port - name: RebusRabbitMqOptions__ConnectionString value: "amqp://$(ASPNETCORE_rmqc_username):$(ASPNETCORE_rmqc_password)@$(ASPNETCORE_rmqc_host):$(ASPNETCORE_rmqc_port)/" - name: WTelegramClientOptions__ApiId @@ -65,42 +65,38 @@ spec: mountPath: /app/.secrets - name: rw-files mountPath: /tmp/rw-files + livenessProbe: + httpGet: + path: /health + port: 8080 + initialDelaySeconds: 30 + periodSeconds: 30 + timeoutSeconds: 5 + readinessProbe: + httpGet: + path: /health + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 initContainers: - name: "update-mysql-init" image: "busybox:latest" - command: [ - "sh", - "-ce", - "cp /app/.secrets/WTelegram.session /tmp/rw-files/WTelegram.session && - chmod a+w /tmp/rw-files/WTelegram.session && - echo The TL Container is Running ; sleep 5 " ] + command: + - "sh" + - "-ce" + - "cp /app/.secrets/WTelegram.session /tmp/rw-files/WTelegram.session && chmod a+w /tmp/rw-files/WTelegram.session && echo The TL Container is Running ; sleep 5" volumeMounts: - name: secrets mountPath: /app/.secrets - name: rw-files mountPath: /tmp/rw-files - - livenessProbe: - httpGet: - path: /health - port: 8080 - initialDelaySeconds: 30 - periodSeconds: 30 - timeoutSeconds: 5 - - readinessProbe: - httpGet: - path: /health - port: 8080 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - name: secrets secret: secretName: secretfiles - name: rw-files emptyDir: {} + --- apiVersion: apps/v1 kind: Deployment @@ -148,22 +144,22 @@ spec: valueFrom: secretKeyRef: name: rmqc-default-user - key: host + key: host - name: rmqc_username valueFrom: secretKeyRef: name: rmqc-default-user - key: username + key: username - name: rmqc_password valueFrom: secretKeyRef: name: rmqc-default-user - key: password + key: password - name: rmqc_port valueFrom: secretKeyRef: name: rmqc-default-user - key: port + key: port - name: RebusRabbitMqOptions__ConnectionString value: "amqp://$(rmqc_username):$(rmqc_password)@$(rmqc_host):$(rmqc_port)/" - name: mariadb_host @@ -179,6 +175,7 @@ spec: key: mariadb-root-password - name: ConnectionStrings__TextMatcherContext value: "server=$(mariadb_host);port=3306;database=$(mariadb_database);uid=$(mariadb_user);pwd=$(mariadb_password)" + --- apiVersion: v1 kind: Service @@ -192,12 +189,13 @@ spec: - protocol: TCP port: 80 targetPort: 8080 - type: NodePort # Change the service type to NodePort + type: NodePort + --- apiVersion: apps/v1 kind: Deployment metadata: - name: users + name: users namespace: nocr spec: replicas: 1 @@ -249,6 +247,7 @@ spec: key: mariadb-root-password - name: ConnectionStrings__UsersContext value: "server=$(mariadb_host);port=3306;database=$(mariadb_database);uid=$(mariadb_user);pwd=$(mariadb_password)" + --- apiVersion: v1 kind: Service @@ -262,13 +261,13 @@ spec: - protocol: TCP port: 80 targetPort: 8080 - type: NodePort # Change the service type to NodePort + type: NodePort --- apiVersion: apps/v1 kind: Deployment metadata: - name: telegram-client + name: telegram-client namespace: nocr spec: replicas: 1 @@ -292,22 +291,22 @@ spec: valueFrom: secretKeyRef: name: rmqc-default-user - key: host + key: host - name: rmqc_username valueFrom: secretKeyRef: name: rmqc-default-user - key: username + key: username - name: rmqc_password valueFrom: secretKeyRef: name: rmqc-default-user - key: password + key: password - name: rmqc_port valueFrom: secretKeyRef: name: rmqc-default-user - key: port + key: port - name: RebusRabbitMqOptions__ConnectionString value: "amqp://$(rmqc_username):$(rmqc_password)@$(rmqc_host):$(rmqc_port)/" - name: mariadb_host