diff --git a/.github/workflows/publish-tag.yaml b/.github/workflows/publish-tag.yaml index 871097d..3e33a2d 100644 --- a/.github/workflows/publish-tag.yaml +++ b/.github/workflows/publish-tag.yaml @@ -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' }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 83437a0..e8bb9d9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -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 diff --git a/.github/workflows/release_arm.yaml b/.github/workflows/release_arm.yaml index 4bb0e33..5e423e0 100644 --- a/.github/workflows/release_arm.yaml +++ b/.github/workflows/release_arm.yaml @@ -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 diff --git a/Dockerfile.ovpn-admin b/Dockerfile.ovpn-admin index 007dc28..2d7f428 100644 --- a/Dockerfile.ovpn-admin +++ b/Dockerfile.ovpn-admin @@ -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 diff --git a/charts/openvpn-admin/Chart.yaml b/charts/openvpn-admin/Chart.yaml index 075ea46..cf4aadb 100644 --- a/charts/openvpn-admin/Chart.yaml +++ b/charts/openvpn-admin/Chart.yaml @@ -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 diff --git a/charts/openvpn-admin/README.md b/charts/openvpn-admin/README.md index 1094cb3..8f09046 100644 --- a/charts/openvpn-admin/README.md +++ b/charts/openvpn-admin/README.md @@ -1,6 +1,6 @@ # openvpn-admin -![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: 2.0.2](https://img.shields.io/badge/AppVersion-2.0.2-informational?style=flat-square) +![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![AppVersion: 2.0.2](https://img.shields.io/badge/AppVersion-2.0.2-informational?style=flat-square) 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) diff --git a/charts/openvpn-admin/templates/ingress.yaml b/charts/openvpn-admin/templates/ingress.yaml index 98d12e5..af4c144 100644 --- a/charts/openvpn-admin/templates/ingress.yaml +++ b/charts/openvpn-admin/templates/ingress.yaml @@ -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: / diff --git a/charts/openvpn-admin/templates/secret.yaml b/charts/openvpn-admin/templates/secret.yaml index b2dd27d..fa12dc4 100644 --- a/charts/openvpn-admin/templates/secret.yaml +++ b/charts/openvpn-admin/templates/secret.yaml @@ -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 }} diff --git a/charts/openvpn-admin/values.yaml b/charts/openvpn-admin/values.yaml index 413fac8..b62cb37 100644 --- a/charts/openvpn-admin/values.yaml +++ b/charts/openvpn-admin/values.yaml @@ -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 diff --git a/go.mod b/go.mod index 90d7a8a..35e0fe4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module ovpn-admin -go 1.17 +go 1.23 require ( github.com/gobuffalo/packr/v2 v2.8.3