diff --git a/cluster/apps/semaphore/semaphore-configmap.yml b/cluster/apps/semaphore/semaphore-configmap.yml index 8ab4e2b..d06e0ac 100644 --- a/cluster/apps/semaphore/semaphore-configmap.yml +++ b/cluster/apps/semaphore/semaphore-configmap.yml @@ -6,7 +6,7 @@ metadata: namespace: default data: SEMAPHORE_DB_USER: "semaphore" - SEMAPHORE_DB_HOST: "semaphore-db-service" + SEMAPHORE_DB_HOST: "localhost" SEMAPHORE_DB_PORT: "3306" SEMAPHORE_DB_DIALECT: "mysql" SEMAPHORE_DB: "semaphore" diff --git a/cluster/apps/semaphore/semaphore-db.yml b/cluster/apps/semaphore/semaphore-db.yml deleted file mode 100644 index d01a96b..0000000 --- a/cluster/apps/semaphore/semaphore-db.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: semaphore-db - namespace: default -spec: - selector: - matchLabels: - app: semaphore-db - template: - metadata: - labels: - app: semaphore-db - spec: - containers: - - name: mysql - image: mysql:8.4 - ports: - - containerPort: 3306 - env: - - name: MYSQL_RANDOM_ROOT_PASSWORD - value: "'yes'" - - name: MYSQL_DATABASE - value: "semaphore" - - name: MYSQL_USER - value: "semaphore" - - name: MYSQL_PASSWORD - valueFrom: - secretKeyRef: - name: semaphore-secrets - key: mysql_password - volumeMounts: - - name: db - mountPath: /var/lib/mysql - volumes: - - name: db - persistentVolumeClaim: - claimName: longhorn-semaphore diff --git a/cluster/apps/semaphore/semaphore-svc.yml b/cluster/apps/semaphore/semaphore-svc.yml index bfe8d81..e71bf13 100644 --- a/cluster/apps/semaphore/semaphore-svc.yml +++ b/cluster/apps/semaphore/semaphore-svc.yml @@ -13,17 +13,3 @@ spec: targetPort: 3000 nodePort: 3002 protocol: TCP - ---- -apiVersion: v1 -kind: Service -metadata: - name: semaphore-db-service - namespace: default -spec: - selector: - app: semaphore-db - ports: - - protocol: TCP - port: 3306 - targetPort: 3306 diff --git a/cluster/apps/semaphore/semaphore.yml b/cluster/apps/semaphore/semaphore.yml index 9504d1b..21e9fb9 100644 --- a/cluster/apps/semaphore/semaphore.yml +++ b/cluster/apps/semaphore/semaphore.yml @@ -15,16 +15,26 @@ spec: app: semaphore spec: initContainers: - - name: wait-for-db - image: busybox - command: - - sh - - -c - - | - until nc -z -v -w30 semaphore-db-service 3306; do - echo "Waiting for database to be ready..." - sleep 2 - done + - name: mysql + image: mysql:8.4 + restartPolicy: Always + ports: + - containerPort: 3306 + env: + - name: MYSQL_RANDOM_ROOT_PASSWORD + value: "'yes'" + - name: MYSQL_DATABASE + value: "semaphore" + - name: MYSQL_USER + value: "semaphore" + - name: MYSQL_PASSWORD + valueFrom: + secretKeyRef: + name: semaphore-secrets + key: mysql_password + volumeMounts: + - name: db + mountPath: /var/lib/mysql containers: - name: semaphore image: public.ecr.aws/semaphore/pro/server:v2.14.8 @@ -49,3 +59,7 @@ spec: secretKeyRef: name: semaphore-secrets key: key + volumes: + - name: db + persistentVolumeClaim: + claimName: longhorn-semaphore