More CI fixes (#321)
Signed-off-by: maksim.nabokikh <max.nabokih@gmail.com>
This commit is contained in:
parent
76faf8db73
commit
b7d1b3cad3
10 changed files with 20 additions and 17 deletions
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 <(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
|
||||
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
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
goversion: 1.17
|
||||
goversion: 1.23
|
||||
goos: ${{ matrix.goos }}
|
||||
goarch: ${{ matrix.goarch }}
|
||||
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
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
goversion: 1.17
|
||||
goversion: 1.23
|
||||
goos: ${{ matrix.goos }}
|
||||
goarch: ${{ matrix.goarch }}
|
||||
build_command: bash -ex ./build_arm.sh
|
||||
|
|
|
@ -2,7 +2,7 @@ FROM node:16-alpine3.15 AS frontend-builder
|
|||
COPY ../frontend /app
|
||||
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
|
||||
COPY --from=frontend-builder /app/static /app/frontend/static
|
||||
COPY .. /app
|
||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
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.
|
||||
name: openvpn-admin
|
||||
version: "0.0.2"
|
||||
version: "0.0.3"
|
||||
kubeVersion: ">=1.14.0-0"
|
||||
maintainers:
|
||||
- name: nabokihms
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# 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.
|
||||
|
||||
|
@ -22,10 +22,7 @@ Kubernetes: `>=1.14.0-0`
|
|||
|
||||
| Key | Type | Default | Description |
|
||||
|-----|------|---------|-------------|
|
||||
| domain | string | `"changeme"` | |
|
||||
| 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.subnet | string | `"172.16.200.0/255.255.255.0"` | |
|
||||
| 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.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.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)
|
||||
|
|
|
@ -17,10 +17,10 @@ spec:
|
|||
{{- end }}
|
||||
tls:
|
||||
- hosts:
|
||||
- {{ .Values.domain }}
|
||||
- {{ .Values.ingress.domain }}
|
||||
secretName: ingress-tls
|
||||
rules:
|
||||
- host: {{ .Values.domain }}
|
||||
- host: {{ .Values.ingress.domain }}
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
|
|
|
@ -5,4 +5,4 @@ metadata:
|
|||
name: basic-auth
|
||||
type: Opaque
|
||||
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:
|
||||
repo: ghcr.io/palark/ovpn-admin/ovpn-admin
|
||||
basicAuth:
|
||||
user: admin
|
||||
password: changeme
|
||||
|
||||
openvpn:
|
||||
repo: ghcr.io/palark/ovpn-admin/openvpn
|
||||
subnet: 172.16.200.0/255.255.255.0
|
||||
|
@ -37,3 +34,9 @@ ingress:
|
|||
annotations: {}
|
||||
# kubernetes.io/ingress.class: nginx
|
||||
# kubernetes.io/tls-acme: "true"
|
||||
|
||||
domain: changeme
|
||||
|
||||
basicAuth:
|
||||
user: admin
|
||||
password: changeme
|
||||
|
|
2
go.mod
2
go.mod
|
@ -1,6 +1,6 @@
|
|||
module ovpn-admin
|
||||
|
||||
go 1.17
|
||||
go 1.23
|
||||
|
||||
require (
|
||||
github.com/gobuffalo/packr/v2 v2.8.3
|
||||
|
|
Loading…
Add table
Reference in a new issue