From 75a7385d59c15ee94fb24fc4fd064c07ae13788c Mon Sep 17 00:00:00 2001 From: Maksim Nabokikh Date: Tue, 4 Mar 2025 08:00:52 +0100 Subject: [PATCH] More CI fixes (#311) Signed-off-by: maksim.nabokikh --- .github/workflows/chart-test.yaml | 10 +++--- .github/workflows/publish-latest.yaml | 35 ------------------- .github/workflows/publish-tag.yaml | 2 +- charts/cr.yaml | 2 ++ charts/openvpn-admin/Chart.yaml | 2 +- charts/openvpn-admin/README.md | 6 ++-- .../openvpn-admin/templates/deployment.yaml | 4 +-- charts/openvpn-admin/values.yaml | 4 +-- 8 files changed, 16 insertions(+), 49 deletions(-) delete mode 100644 .github/workflows/publish-latest.yaml create mode 100644 charts/cr.yaml diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml index 1dcab4e..8e0ee01 100644 --- a/.github/workflows/chart-test.yaml +++ b/.github/workflows/chart-test.yaml @@ -61,7 +61,7 @@ jobs: strategy: fail-fast: false matrix: - kube: ["1.24", "1.25", "1.26"] + kube: ["1.25", "1.29", "1.31"] steps: - name: Checkout @@ -87,12 +87,12 @@ jobs: id: node_image run: | case ${{ matrix.kube }} in - 1.24) - NODE_IMAGE=kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315 ;; 1.25) NODE_IMAGE=kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1 ;; - 1.26) - NODE_IMAGE=kindest/node:v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352 ;; + 1.29) + NODE_IMAGE=kindest/node:v1.29.12@sha256:62c0672ba99a4afd7396512848d6fc382906b8f33349ae68fb1dbfe549f70dec ;; + 1.31) + NODE_IMAGE=kindest/node:v1.31.2@sha256:0526eb5cd8d892ed79b56feb48d17eeee1f719f55d5c35cef468f053caffad32 ;; esac echo "image=$NODE_IMAGE" >> $GITHUB_OUTPUT diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml deleted file mode 100644 index 2596741..0000000 --- a/.github/workflows/publish-latest.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Build and publish latest tag to Docker Hub (releases only) -on: - release: - types: [created] - -jobs: - build: - name: build latest images for release - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_PASS }} - - name: Push openvpn image to Docker Hub - uses: docker/build-push-action@v4 - with: - tags: flant/ovpn-admin:openvpn-latest - platforms: linux/amd64,linux/arm64,linux/arm - file: Dockerfile.ovpn-admin - push: true - - name: Push ovpn-admin image to Docker Hub - uses: docker/build-push-action@v4 - with: - tags: flant/ovpn-admin:latest - platforms: linux/amd64,linux/arm64,linux/arm - file: Dockerfile.openvpn - push: true diff --git a/.github/workflows/publish-tag.yaml b/.github/workflows/publish-tag.yaml index db1f281..871097d 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 + werf build --repo='' --final-repo='' - name: Build and Push Image if: ${{ github.event_name != 'pull_request' }} diff --git a/charts/cr.yaml b/charts/cr.yaml new file mode 100644 index 0000000..5ffb82d --- /dev/null +++ b/charts/cr.yaml @@ -0,0 +1,2 @@ +owner: palark +git-base-url: https://api.github.com/ diff --git a/charts/openvpn-admin/Chart.yaml b/charts/openvpn-admin/Chart.yaml index 614f6aa..075ea46 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.1" +version: "0.0.2" kubeVersion: ">=1.14.0-0" maintainers: - name: nabokihms diff --git a/charts/openvpn-admin/README.md b/charts/openvpn-admin/README.md index f5bd9df..1094cb3 100644 --- a/charts/openvpn-admin/README.md +++ b/charts/openvpn-admin/README.md @@ -1,6 +1,6 @@ # openvpn-admin -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 2.0.2](https://img.shields.io/badge/AppVersion-2.0.2-informational?style=flat-square) +![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) Simple web UI to manage OpenVPN users, their certificates & routes in Linux. While backend is written in Go, frontend is based on Vue.js. @@ -23,10 +23,10 @@ Kubernetes: `>=1.14.0-0` | Key | Type | Default | Description | |-----|------|---------|-------------| | domain | string | `"changeme"` | | -| ovpnAdmin.image | string | `"changeme"` | | +| ovpnAdmin.repo | string | `"ghcr.io/palark/ovpn-admin/ovpn-admin"` | | | ovpnAdmin.basicAuth.user | string | `"admin"` | | | ovpnAdmin.basicAuth.password | string | `"changeme"` | | -| openvpn.image | 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"` | | | openvpn.hostPort | int | `1194` | | diff --git a/charts/openvpn-admin/templates/deployment.yaml b/charts/openvpn-admin/templates/deployment.yaml index 4d40491..c63ee08 100644 --- a/charts/openvpn-admin/templates/deployment.yaml +++ b/charts/openvpn-admin/templates/deployment.yaml @@ -24,7 +24,7 @@ spec: serviceAccountName: openvpn containers: - name: ovpn-admin - image: {{ .Values.ovpnAdmin.image }} + image: {{ .Values.ovpnAdmin.repo }}:master command: - /bin/sh - -c @@ -60,7 +60,7 @@ spec: - name: ccd mountPath: /mnt/ccd - name: openvpn - image: {{ .Values.openvpn.image }} + image: {{ .Values.ovpnAdmin.repo }}:master command: [ '/entrypoint.sh' ] # imagePullPolicy: Always securityContext: diff --git a/charts/openvpn-admin/values.yaml b/charts/openvpn-admin/values.yaml index 5d0b780..413fac8 100644 --- a/charts/openvpn-admin/values.yaml +++ b/charts/openvpn-admin/values.yaml @@ -1,11 +1,11 @@ domain: changeme ovpnAdmin: - image: changeme + repo: ghcr.io/palark/ovpn-admin/ovpn-admin basicAuth: user: admin password: changeme openvpn: - image: changeme + repo: ghcr.io/palark/ovpn-admin/openvpn subnet: 172.16.200.0/255.255.255.0 # LoadBalancer or ExternalIP or HostPort inlet: HostPort