Merge branch 'dev'

jgoralcz · Oct 18, 2023 · 22c0571 · 22c0571
2 parents a734425 + 2d39049
commit 22c0571
Show file tree

Hide file tree

Showing 6 changed files with 4,740 additions and 1,124 deletions.
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -17,11 +17,6 @@ jobs:
         run: echo "##[set-output name=repo;]$(echo ${GITHUB_REPOSITORY##*/})"
         id: extract_repo
 
-      - name: Build Host URL
-        shell: bash
-        run: echo "##[set-output name=url;]$([ "${GITHUB_REF##*/}" == "master" ] && echo ${{ secrets.HOST_URL }} || echo "beta-${{ secrets.HOST_URL }}")"
-        id: extract_host_url
-
       - name: Push to Docker Hub
         uses: docker/build-push-action@v1
         with:

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # trivia REST API
-5200+ multiple choice trivia questions in a REST API. You can use the live instance at `beta-trivia.bongo.best`
+5200+ multiple choice trivia questions in a REST API. You can use the live instance at `beta-trivia.bongobot.io`
 
 ---
 ### How to Use:
 There are a few ways to get your trivia question 
-1) By id 1-5200
+1. By id 1-5200
 
 **Example**
 ```$xslt
@@ -34,8 +34,8 @@ cache-control: no-cache
 2) By random and with filters
  - search
  - category `(Entertainment | Sports | Science | Animals | General Knowledge | Mythology | Politics | Geography | History)`
- - type `(easy | medium | hard)`
- - difficulty `(boolean | multiple)`
+ - difficulty `(easy | medium | hard)`
+ - type `(boolean | multiple)`
  - limit `(1-10)`
 
 **Example**

diff --git a/k8s/ingress-public.yml b/k8s/ingress-public.yml
@@ -13,10 +13,27 @@ spec:
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: ${SERVICE_NAME}
-              servicePort: ${PORT}
+              service:
+                name: ${SERVICE_NAME}
+                port:
+                  number: 8443
+
+    - host: ${HOST_URL_IO}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: ${SERVICE_NAME}
+                port:
+                  number: 8443 
   tls:
     - hosts:
         - ${HOST_URL}
       secretName: ssl-bongo
+    - hosts:
+        - ${HOST_URL_IO}
+      secretName: ssl-bongobot
diff --git a/k8s/ingress.yml b/k8s/ingress.yml
@@ -20,10 +20,27 @@ spec:
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: ${SERVICE_NAME}
-              servicePort: ${PORT}
+              service:
+                name: ${SERVICE_NAME}
+                port:
+                  number: 8443
+
+    - host: ${HOST_URL_IO}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: ${SERVICE_NAME}
+                port:
+                  number: 8443 
   tls:
     - hosts:
         - ${HOST_URL}
       secretName: ssl-bongo
+    - hosts:
+        - ${HOST_URL_IO}
+      secretName: ssl-bongobot