From 2a506734c331f9b2ef0a9ba9eed0a9e9a6fa2144 Mon Sep 17 00:00:00 2001
From: "maksim.nabokikh" <max.nabokih@gmail.com>
Date: Tue, 4 Mar 2025 07:40:29 +0100
Subject: [PATCH] More CI fixes

Signed-off-by: maksim.nabokikh <max.nabokih@gmail.com>
---
 .github/workflows/chart-test.yaml             |  6 ++--
 .github/workflows/publish-latest.yaml         | 35 -------------------
 .github/workflows/publish-tag.yaml            |  2 +-
 charts/cr.yaml                                |  2 ++
 .../openvpn-admin/templates/deployment.yaml   |  4 +--
 charts/openvpn-admin/values.yaml              |  2 +-
 6 files changed, 9 insertions(+), 42 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..4009e6d 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.24", "1.25", "1.32"]
 
     steps:
       - name: Checkout
@@ -91,8 +91,8 @@ jobs:
               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.32)
+              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/templates/deployment.yaml b/charts/openvpn-admin/templates/deployment.yaml
index 4d40491..ce32bf9 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 }}/ovpn-admin: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 }}/openvpn:master
         command: [ '/entrypoint.sh' ]
         # imagePullPolicy: Always
         securityContext:
diff --git a/charts/openvpn-admin/values.yaml b/charts/openvpn-admin/values.yaml
index 5d0b780..a099cc9 100644
--- a/charts/openvpn-admin/values.yaml
+++ b/charts/openvpn-admin/values.yaml
@@ -5,7 +5,7 @@ ovpnAdmin:
     user: admin
     password: changeme
 openvpn:
-  image: changeme
+  repo: ghcr.io/palark/ovpn-admin
   subnet: 172.16.200.0/255.255.255.0
   # LoadBalancer or ExternalIP or HostPort
   inlet: HostPort