diff --git a/apps/annugame/deploy.yaml b/apps/annugame/deploy.yaml index 127f646..7850a93 100644 --- a/apps/annugame/deploy.yaml +++ b/apps/annugame/deploy.yaml @@ -51,43 +51,6 @@ spec: requests: cpu: 50m memory: 150Mi - - name: annugame-leaderboard - image: ghcr.io/wisvch/annugame-leaderboard:20241002-7ea48fc # {"$imagepolicy": "flux-system:annugame-leaderboard"} - imagePullPolicy: IfNotPresent - ports: - - name: backend - containerPort: 5000 - protocol: TCP - livenessProbe: - httpGet: - path: /api/ - port: backend - initialDelaySeconds: 15 - periodSeconds: 20 - successThreshold: 1 - timeoutSeconds: 5 - readinessProbe: - httpGet: - path: /api/ - port: backend - initialDelaySeconds: 15 - periodSeconds: 20 - successThreshold: 1 - timeoutSeconds: 5 - resources: - limits: - memory: 512Mi - requests: - cpu: 50m - memory: 150Mi - env: - - name: "BASE" - value: "/api" - - name: "DB_BASE" - value: "/db" - volumeMounts: - - mountPath: /db - name: annugame-data volumes: - name: annugame-data persistentVolumeClaim: diff --git a/apps/annugame/healthcheck.yaml b/apps/annugame/healthcheck.yaml index 1f71107..61fd474 100644 --- a/apps/annugame/healthcheck.yaml +++ b/apps/annugame/healthcheck.yaml @@ -17,22 +17,3 @@ spec: group: "" kind: Service name: annugame ---- -apiVersion: networking.gke.io/v1 -kind: HealthCheckPolicy -metadata: - namespace: default - name: annugame-leaderboard -spec: - default: - config: - type: HTTP - httpHealthCheck: - port: 5000 - requestPath: / - logConfig: - enabled: true - targetRef: - group: "" - kind: Service - name: annugame diff --git a/apps/annugame/httproute.yaml b/apps/annugame/httproute.yaml index d3153a1..6f108a1 100644 --- a/apps/annugame/httproute.yaml +++ b/apps/annugame/httproute.yaml @@ -13,11 +13,4 @@ spec: rules: - backendRefs: - name: annugame - port: 80 - - matches: - - path: - type: PathPrefix - value: "/api" - backendRefs: - - name: annugame - port: 5000 + port: 80 \ No newline at end of file diff --git a/apps/annugame/image.yaml b/apps/annugame/image.yaml index 09419e7..86a013c 100644 --- a/apps/annugame/image.yaml +++ b/apps/annugame/image.yaml @@ -20,29 +20,4 @@ spec: extract: "$ts" policy: numerical: - order: asc ---- -apiVersion: image.toolkit.fluxcd.io/v1beta1 -kind: ImageRepository -metadata: - name: annugame-leaderboard - namespace: flux-system -spec: - image: ghcr.io/wisvch/annugame-leaderboard - interval: 15m0s ---- -apiVersion: image.toolkit.fluxcd.io/v1beta1 -kind: ImagePolicy -metadata: - name: annugame-leaderboard - namespace: flux-system -spec: - imageRepositoryRef: - name: annugame-leaderboard - filterTags: - pattern: "^(?P.*)-[a-fA-F0-9]+" - extract: "$ts" - policy: - numerical: - order: asc - + order: asc \ No newline at end of file diff --git a/apps/annugame/service.yaml b/apps/annugame/service.yaml index 91add18..e5c19e4 100644 --- a/apps/annugame/service.yaml +++ b/apps/annugame/service.yaml @@ -11,10 +11,6 @@ spec: port: 80 protocol: TCP targetPort: 80 - - name: backend - port: 5000 - protocol: TCP - targetPort: 5000 selector: app: annugame sessionAffinity: None