More CI fixes

Signed-off-by: maksim.nabokikh <max.nabokih@gmail.com>
This commit is contained in:
maksim.nabokikh 2025-03-04 07:40:29 +01:00
parent 1191bf7f9d
commit 2a506734c3
6 changed files with 9 additions and 42 deletions

View File

@ -61,7 +61,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
kube: ["1.24", "1.25", "1.26"] kube: ["1.24", "1.25", "1.32"]
steps: steps:
- name: Checkout - name: Checkout
@ -91,8 +91,8 @@ jobs:
NODE_IMAGE=kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315 ;; NODE_IMAGE=kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315 ;;
1.25) 1.25)
NODE_IMAGE=kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1 ;; NODE_IMAGE=kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1 ;;
1.26) 1.32)
NODE_IMAGE=kindest/node:v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352 ;; NODE_IMAGE=kindest/node:v1.31.2@sha256:0526eb5cd8d892ed79b56feb48d17eeee1f719f55d5c35cef468f053caffad32 ;;
esac esac
echo "image=$NODE_IMAGE" >> $GITHUB_OUTPUT echo "image=$NODE_IMAGE" >> $GITHUB_OUTPUT

View File

@ -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

View File

@ -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 werf build --repo='' --final-repo=''
- name: Build and Push Image - name: Build and Push Image
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}

2
charts/cr.yaml Normal file
View File

@ -0,0 +1,2 @@
owner: palark
git-base-url: https://api.github.com/

View File

@ -24,7 +24,7 @@ spec:
serviceAccountName: openvpn serviceAccountName: openvpn
containers: containers:
- name: ovpn-admin - name: ovpn-admin
image: {{ .Values.ovpnAdmin.image }} image: {{ .Values.ovpnAdmin.repo }}/ovpn-admin:master
command: command:
- /bin/sh - /bin/sh
- -c - -c
@ -60,7 +60,7 @@ spec:
- name: ccd - name: ccd
mountPath: /mnt/ccd mountPath: /mnt/ccd
- name: openvpn - name: openvpn
image: {{ .Values.openvpn.image }} image: {{ .Values.ovpnAdmin.repo }}/openvpn:master
command: [ '/entrypoint.sh' ] command: [ '/entrypoint.sh' ]
# imagePullPolicy: Always # imagePullPolicy: Always
securityContext: securityContext:

View File

@ -5,7 +5,7 @@ ovpnAdmin:
user: admin user: admin
password: changeme password: changeme
openvpn: openvpn:
image: changeme repo: ghcr.io/palark/ovpn-admin
subnet: 172.16.200.0/255.255.255.0 subnet: 172.16.200.0/255.255.255.0
# LoadBalancer or ExternalIP or HostPort # LoadBalancer or ExternalIP or HostPort
inlet: HostPort inlet: HostPort