mirror of
https://github.com/flant/ovpn-admin.git
synced 2025-12-13 04:16:14 -08:00
More CI fixes (#321)
Signed-off-by: maksim.nabokikh <max.nabokih@gmail.com>
This commit is contained in:
parent
76faf8db73
commit
b7d1b3cad3
2
.github/workflows/publish-tag.yaml
vendored
2
.github/workflows/publish-tag.yaml
vendored
@ -41,7 +41,7 @@ jobs:
|
|||||||
source "$(werf ci-env github --as-file)"
|
source "$(werf ci-env github --as-file)"
|
||||||
source <(jq -r '.labels | to_entries | to_entries[] | "export WERF_EXPORT_ADD_LABEL_\(.key)=\"\(.value.key)=\(.value.value)\""' <<< $DOCKER_METADATA_OUTPUT_JSON)
|
source <(jq -r '.labels | to_entries | to_entries[] | "export WERF_EXPORT_ADD_LABEL_\(.key)=\"\(.value.key)=\(.value.value)\""' <<< $DOCKER_METADATA_OUTPUT_JSON)
|
||||||
|
|
||||||
werf build --repo='' --final-repo=''
|
werf build --repo='' --final-repo='' --secondary-repo "$WERF_REPO"
|
||||||
|
|
||||||
- name: Build and Push Image
|
- name: Build and Push Image
|
||||||
if: ${{ github.event_name != 'pull_request' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
|
|||||||
2
.github/workflows/release.yaml
vendored
2
.github/workflows/release.yaml
vendored
@ -20,7 +20,7 @@ jobs:
|
|||||||
uses: wangyoucao577/go-release-action@v1.53
|
uses: wangyoucao577/go-release-action@v1.53
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
goversion: 1.17
|
goversion: 1.23
|
||||||
goos: ${{ matrix.goos }}
|
goos: ${{ matrix.goos }}
|
||||||
goarch: ${{ matrix.goarch }}
|
goarch: ${{ matrix.goarch }}
|
||||||
build_command: bash -ex ./build.sh
|
build_command: bash -ex ./build.sh
|
||||||
|
|||||||
2
.github/workflows/release_arm.yaml
vendored
2
.github/workflows/release_arm.yaml
vendored
@ -20,7 +20,7 @@ jobs:
|
|||||||
uses: wangyoucao577/go-release-action@v1.53
|
uses: wangyoucao577/go-release-action@v1.53
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
goversion: 1.17
|
goversion: 1.23
|
||||||
goos: ${{ matrix.goos }}
|
goos: ${{ matrix.goos }}
|
||||||
goarch: ${{ matrix.goarch }}
|
goarch: ${{ matrix.goarch }}
|
||||||
build_command: bash -ex ./build_arm.sh
|
build_command: bash -ex ./build_arm.sh
|
||||||
|
|||||||
@ -2,7 +2,7 @@ FROM node:16-alpine3.15 AS frontend-builder
|
|||||||
COPY ../frontend /app
|
COPY ../frontend /app
|
||||||
RUN apk add --update python3 make g++ && cd /app && npm install && npm run build
|
RUN apk add --update python3 make g++ && cd /app && npm install && npm run build
|
||||||
|
|
||||||
FROM golang:1.17.3-buster AS backend-builder
|
FROM golang:1.23.6-bullseye AS backend-builder
|
||||||
RUN go install github.com/gobuffalo/packr/v2/packr2@latest
|
RUN go install github.com/gobuffalo/packr/v2/packr2@latest
|
||||||
COPY --from=frontend-builder /app/static /app/frontend/static
|
COPY --from=frontend-builder /app/static /app/frontend/static
|
||||||
COPY .. /app
|
COPY .. /app
|
||||||
|
|||||||
@ -2,7 +2,7 @@ apiVersion: v1
|
|||||||
appVersion: "2.0.2"
|
appVersion: "2.0.2"
|
||||||
description: Simple web UI to manage OpenVPN users, their certificates & routes in Linux. While backend is written in Go, frontend is based on Vue.js.
|
description: Simple web UI to manage OpenVPN users, their certificates & routes in Linux. While backend is written in Go, frontend is based on Vue.js.
|
||||||
name: openvpn-admin
|
name: openvpn-admin
|
||||||
version: "0.0.2"
|
version: "0.0.3"
|
||||||
kubeVersion: ">=1.14.0-0"
|
kubeVersion: ">=1.14.0-0"
|
||||||
maintainers:
|
maintainers:
|
||||||
- name: nabokihms
|
- name: nabokihms
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# openvpn-admin
|
# openvpn-admin
|
||||||
|
|
||||||
 
|
 
|
||||||
|
|
||||||
Simple web UI to manage OpenVPN users, their certificates & routes in Linux. While backend is written in Go, frontend is based on Vue.js.
|
Simple web UI to manage OpenVPN users, their certificates & routes in Linux. While backend is written in Go, frontend is based on Vue.js.
|
||||||
|
|
||||||
@ -22,10 +22,7 @@ Kubernetes: `>=1.14.0-0`
|
|||||||
|
|
||||||
| Key | Type | Default | Description |
|
| Key | Type | Default | Description |
|
||||||
|-----|------|---------|-------------|
|
|-----|------|---------|-------------|
|
||||||
| domain | string | `"changeme"` | |
|
|
||||||
| ovpnAdmin.repo | string | `"ghcr.io/palark/ovpn-admin/ovpn-admin"` | |
|
| ovpnAdmin.repo | string | `"ghcr.io/palark/ovpn-admin/ovpn-admin"` | |
|
||||||
| ovpnAdmin.basicAuth.user | string | `"admin"` | |
|
|
||||||
| ovpnAdmin.basicAuth.password | string | `"changeme"` | |
|
|
||||||
| openvpn.repo | string | `"ghcr.io/palark/ovpn-admin/openvpn"` | |
|
| openvpn.repo | string | `"ghcr.io/palark/ovpn-admin/openvpn"` | |
|
||||||
| openvpn.subnet | string | `"172.16.200.0/255.255.255.0"` | |
|
| openvpn.subnet | string | `"172.16.200.0/255.255.255.0"` | |
|
||||||
| openvpn.inlet | string | `"HostPort"` | |
|
| openvpn.inlet | string | `"HostPort"` | |
|
||||||
@ -35,6 +32,9 @@ Kubernetes: `>=1.14.0-0`
|
|||||||
| ingress.enabled | bool | `false` | Enable [ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/). |
|
| ingress.enabled | bool | `false` | Enable [ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/). |
|
||||||
| ingress.className | string | `""` | Ingress [class name](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class). |
|
| ingress.className | string | `""` | Ingress [class name](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class). |
|
||||||
| ingress.annotations | object | `{}` | Annotations to be added to the ingress. |
|
| ingress.annotations | object | `{}` | Annotations to be added to the ingress. |
|
||||||
|
| ingress.domain | string | `"changeme"` | |
|
||||||
|
| ingress.basicAuth.user | string | `"admin"` | |
|
||||||
|
| ingress.basicAuth.password | string | `"changeme"` | |
|
||||||
|
|
||||||
----------------------------------------------
|
----------------------------------------------
|
||||||
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
|
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
|
||||||
|
|||||||
@ -17,10 +17,10 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
tls:
|
tls:
|
||||||
- hosts:
|
- hosts:
|
||||||
- {{ .Values.domain }}
|
- {{ .Values.ingress.domain }}
|
||||||
secretName: ingress-tls
|
secretName: ingress-tls
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.domain }}
|
- host: {{ .Values.ingress.domain }}
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
|
|||||||
@ -5,4 +5,4 @@ metadata:
|
|||||||
name: basic-auth
|
name: basic-auth
|
||||||
type: Opaque
|
type: Opaque
|
||||||
data:
|
data:
|
||||||
auth: {{ print .Values.ovpnAdmin.basicAuth.user ":{PLAIN}" .Values.ovpnAdmin.basicAuth.password | b64enc | quote }}
|
auth: {{ print .Values.ingress.basicAuth.user ":{PLAIN}" .Values.ingress.basicAuth.password | b64enc | quote }}
|
||||||
|
|||||||
@ -1,9 +1,6 @@
|
|||||||
domain: changeme
|
|
||||||
ovpnAdmin:
|
ovpnAdmin:
|
||||||
repo: ghcr.io/palark/ovpn-admin/ovpn-admin
|
repo: ghcr.io/palark/ovpn-admin/ovpn-admin
|
||||||
basicAuth:
|
|
||||||
user: admin
|
|
||||||
password: changeme
|
|
||||||
openvpn:
|
openvpn:
|
||||||
repo: ghcr.io/palark/ovpn-admin/openvpn
|
repo: ghcr.io/palark/ovpn-admin/openvpn
|
||||||
subnet: 172.16.200.0/255.255.255.0
|
subnet: 172.16.200.0/255.255.255.0
|
||||||
@ -37,3 +34,9 @@ ingress:
|
|||||||
annotations: {}
|
annotations: {}
|
||||||
# kubernetes.io/ingress.class: nginx
|
# kubernetes.io/ingress.class: nginx
|
||||||
# kubernetes.io/tls-acme: "true"
|
# kubernetes.io/tls-acme: "true"
|
||||||
|
|
||||||
|
domain: changeme
|
||||||
|
|
||||||
|
basicAuth:
|
||||||
|
user: admin
|
||||||
|
password: changeme
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user