Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docs and helm fix #33

Merged
merged 6 commits into from
Apr 18, 2020
Merged

Docs and helm fix #33

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f57c16
Allow all of wireguard config to be populated, instead of just the wi…
halkeye Apr 16, 2020
7eab8b5
Allow external policy (real ip) and annotations (external-dns) to be set
halkeye Apr 16, 2020
ebab5fd
Ingress should point to the port on the container, not the service de…
halkeye Apr 16, 2020
52d9645
Make sure example scopes is not invalid, and more docs
halkeye Apr 16, 2020
9f223c2
Externaladdress shouldn't include port
halkeye Apr 16, 2020
b622a27
Revert "Ingress should point to the port on the container, not the se…
halkeye Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/helm/wg-access-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The command removes all the Kubernetes components associated with the chart and
```yaml
config:
wireguard:
externalHost: "<loadbalancer-ip>:51820"
externalHost: "<loadbalancer-ip>"
wireguard:
config:
privateKey: "<wireguard-private-key>"
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/wg-access-server/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
{{- include "wg-access-server.labels" . | nindent 4 }}
data:
config.yaml: |-
{{- if .Values.config.wireguard }}
{{ toYaml .Values.config.wireguard | indent 4 }}
{{- if .Values.config }}
{{ toYaml .Values.config | indent 4 }}
{{- end }}
2 changes: 2 additions & 0 deletions deploy/helm/wg-access-server/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
{{- include "wg-access-server.selectorLabels" . | nindent 6 }}
template:
metadata:
annotations:
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
labels:
{{- include "wg-access-server.selectorLabels" . | nindent 8 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/wg-access-server/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ spec:
- path: /
backend:
serviceName: {{ $fullName }}-web
servicePort: 80
servicePort: 8000
Place1 marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
{{- end }}
7 changes: 7 additions & 0 deletions deploy/helm/wg-access-server/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ metadata:
name: {{ $fullName }}-wireguard
labels:
{{- include "wg-access-server.labels" . | nindent 4 }}
{{- if .Values.wireguard.service.annotations }}
annotations:
{{ toYaml .Values.wireguard.service.annotations | indent 4 }}
{{- end }}
spec:
{{- if .Values.wireguard.service.externalTrafficPolicy }}
externalTrafficPolicy: {{ .Values.wireguard.service.externalTrafficPolicy }}
{{- end }}
type: {{ .Values.wireguard.service.type }}
{{- if .Values.wireguard.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.wireguard.service.loadBalancerIP }}
Expand Down
11 changes: 5 additions & 6 deletions docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ wireguard:
# If this value is empty then the server will use an in-memory
# generated key
privateKey: ""
# ExternalAddress is the address that clients
# use to connect to the wireguard interface
# ExternalAddress is the address (without port) that clients use to connect to the wireguard interface
# By default, this will be empty and the web ui
# will use the current page's origin i.e. window.location.origin
# Optional
Expand Down Expand Up @@ -140,12 +139,12 @@ auth:
# You can create a user using "htpasswd -nB <username>"
users: []
oidc:
name: ""
issuer: ""
name: "" # anything you want
issuer: "" # Should point to the oidc url without .well-known
clientID: ""
clientSecret: ""
scopes: ""
redirectURL: ""
scopes: null # list of scopes, defaults to ["openid"]
redirectURL: "" # full url you want the oidc to redirect to, example: https://vpn-admin.example.com/finish-signin
# Optionally restrict login to users with an allowed email domain
# if empty or omitted, any email domain will be allowed.
emailDomains:
Expand Down