diff --git a/.vscode/launch.json b/.vscode/launch.json index 97ae18a4..6ba241e0 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,6 +8,7 @@ "name": "Run Program", "type": "go", "request": "launch", + "cwd": "${workspaceRoot}", "mode": "auto", "program": "${workspaceRoot}/cmd/devguard/main.go", "args": [], diff --git a/charts/devguard/Chart.yaml b/charts/devguard/Chart.yaml index fc37c449..969c70c6 100644 --- a/charts/devguard/Chart.yaml +++ b/charts/devguard/Chart.yaml @@ -15,7 +15,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.5.17 +version: 0.5.18 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/devguard/templates/devguard-web/deployment.yaml b/charts/devguard/templates/devguard-web/deployment.yaml index f89b7d92..a2a63534 100644 --- a/charts/devguard/templates/devguard-web/deployment.yaml +++ b/charts/devguard/templates/devguard-web/deployment.yaml @@ -43,6 +43,8 @@ spec: value: http://kratos:4433 - name: DEVGUARD_API_URL value: http://devguard-api-service:8080 + - name: DEVGUARD_API_URL_PUBLIC_INTERNET + value: {{ .Values.web.devguardApiUrlPublicInternet }} ports: - name: http containerPort: 3000 diff --git a/charts/devguard/values.yaml b/charts/devguard/values.yaml index 211d77cc..148df65c 100644 --- a/charts/devguard/values.yaml +++ b/charts/devguard/values.yaml @@ -49,10 +49,10 @@ api: className: "" annotations: {} hosts: - - host: example.com - paths: - - path: / - pathType: Prefix + - host: example.com + paths: + - path: / + pathType: Prefix intoto: existingPrivateKeySecretName: ec-private-key @@ -63,7 +63,9 @@ api: existingWebhookSecretSecretName: github-app-webhook-secret # needs to contain key "privateKey" existingPrivateKeySecretName: github-app-private-key + web: + devguardApiUrlPublicInternet: "" image: repository: ghcr.io/l3montree-dev/devguard-web pullPolicy: IfNotPresent @@ -97,7 +99,7 @@ web: className: "" annotations: {} hosts: - - host: app.example.com - paths: - - path: / - pathType: Prefix + - host: app.example.com + paths: + - path: / + pathType: Prefix