Skip to content

Commit

Permalink
Merge pull request #62 from digitalist-se/fix_public_url
Browse files Browse the repository at this point in the history
set public url to empty string if not set and no ingress
  • Loading branch information
mikkeschiren authored Sep 20, 2024
2 parents 2d63c29 + 50f7ca9 commit 98f2798
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checkov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
if: github.actor != 'dependabot[bot]'
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run Checkov action
id: checkov
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Configure Git
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
unittest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: d3adb5/helm-unittest-action@v2
with:
install-mode: force
Expand Down
2 changes: 1 addition & 1 deletion charts/directus/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.9.01
version: 0.9.02

# This is the version number of the application being deployed. They should reflect the version
# the application is using.
Expand Down
3 changes: 3 additions & 0 deletions charts/directus/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ spec:
{{- if .Values.ingress.enabled }}
- name: PUBLIC_URL
value: http{{ if .Values.ingress.tls }}s{{ end }}://{{(index .Values.ingress.hosts 0).host }}
{{ else }}
- name: PUBLIC_URL
value: ""
{{- end }}
{{- end }}
- name: KEY
Expand Down

0 comments on commit 98f2798

Please sign in to comment.