Use ingress instead of url as config key

Ref #1502 (comment)
2i2c-org · Jul 11, 2022 · 3a68b4a · 3a68b4a
1 parent fd2ef70
commit 3a68b4a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/config/clusters/2i2c/staging.values.yaml b/config/clusters/2i2c/staging.values.yaml
@@ -8,7 +8,7 @@ staticWebsite:
     git:
       repo: https://github.com/yuvipanda/test-repo-push
       branch: master
-  url:
+  ingress:
     host: staging.2i2c.cloud
     path: /textbook
   githubAuth:

diff --git a/docs/howto/features/static-sites.md b/docs/howto/features/static-sites.md
@@ -22,7 +22,7 @@ staticWebsite:
     git:
       repo: <url-of-git-repo>
       branch: <name-of-git-branch>
-  url:
+  ingress:
     host: <hostname-of-hub>
     path: <absolute-path-where-content-is-available>
 
@@ -61,7 +61,7 @@ staticWebsite:
     git:
       repo: https://github.com/inferentialthinking/inferentialthinking.github.io
       branch: master
-  url:
+  ingress:
     host: staging.2i2c.cloud
     path: /textbook
 

diff --git a/helm-charts/basehub/templates/static/configmap.yaml b/helm-charts/basehub/templates/static/configmap.yaml
@@ -9,7 +9,7 @@ data:
   nginx.conf: |
     server {
       listen 8080;
-      location {{ .Values.staticWebsite.url.path }} {
+      location {{ .Values.staticWebsite.ingress.path }} {
         index index.html;
         alias /srv/content/repo;
       }

diff --git a/helm-charts/basehub/templates/static/ingress.yaml b/helm-charts/basehub/templates/static/ingress.yaml
@@ -11,10 +11,10 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: {{ .Values.staticWebsite.url.host }}
+  - host: {{ .Values.staticWebsite.ingress.host }}
     http:
       paths:
-      - path: {{ .Values.staticWebsite.url.path }}
+      - path: {{ .Values.staticWebsite.ingress.path }}
         pathType: Prefix
         backend:
           service:

diff --git a/helm-charts/basehub/values.schema.yaml b/helm-charts/basehub/values.schema.yaml
@@ -76,11 +76,11 @@ properties:
                 type: string
                 description: |
                   Private RSA key created to authenticate as this GitHuba pp
-      url:
+      ingress:
         type: object
         additionalProperties: false
         description: |
-          URL where this static website should be available
+          Configuration for the ingress that gets traffic into the static site
         properties:
           host:
             type: string