Merge 213e1d7b0f0981e68e4181b7c209a984b710eb6e into 2edd30798db5764a391f87645175805f7a00c894

Merge pull request #377 from palark/dependabot/docker/golang-1.24.5-bullseye
Bump golang from 1.24.4-bullseye to 1.24.5-bullseye
2026-02-04 01:10:22 -08:00 · 2025-07-14 13:45:48 +03:00 · 2025-07-14 11:10:39 +07:00 · 2025-07-14 02:36:08 +00:00 · 2025-07-08 16:48:40 +07:00 · 2025-06-23 02:39:52 +00:00
6 changed files with 27 additions and 16 deletions
--- 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.24.4-bullseye AS backend-builder
+FROM golang:1.24.5-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
--- a/go.mod
+++ b/go.mod
@ -8,9 +8,9 @@ require (
 	github.com/prometheus/client_golang v1.22.0
 	github.com/sirupsen/logrus v1.9.3
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	k8s.io/api v0.33.1
-	k8s.io/apimachinery v0.33.1
-	k8s.io/client-go v0.33.1
+	k8s.io/api v0.33.2
+	k8s.io/apimachinery v0.33.2
+	k8s.io/client-go v0.33.2
 )

 require (
--- a/go.sum
+++ b/go.sum
@ -703,12 +703,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
-k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
-k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
-k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
-k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
+k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
+k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
+k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
+k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
+k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
--- a/helpers.go
+++ b/helpers.go
@ -288,6 +288,17 @@ func extractFromArchive(archive, path string) error {
 				log.Fatalf("extractFromArchive: Mkdir() failed: %s", err.Error())
 			}
 		case tar.TypeReg:
+			s := strings.Split(header.Name, "/")
+			dir := ""
+
+			for len(s) > 1 {
+				dir, s = dir+"/"+s[0], s[1:]
+				if _, err := os.Stat(path + dir); os.IsNotExist(err) {
+					if err := os.Mkdir(path+dir, 0755); err != nil {
+						log.Fatalf("extractFromArchive: Mkdir() subdir failed: %s", err.Error())
+					}
+				}
+			}
 			outFile, err := os.Create(path + "/" + header.Name)
 			if err != nil {
 				log.Fatalf("extractFromArchive: Create() failed: %s", err.Error())
--- a/main.go
+++ b/main.go
@ -527,6 +527,11 @@ func main() {
 		ovpnAdmin.mgmtInterfaces[parts[0]] = parts[len(parts)-1]
 	}

+	if ovpnAdmin.role == "slave" {
+		ovpnAdmin.syncDataFromMaster()
+		go ovpnAdmin.syncWithMaster()
+	}
+
 	ovpnAdmin.mgmtSetTimeFormat()

 	ovpnAdmin.registerMetrics()
@ -554,11 +559,6 @@ func main() {
 		ovpnAdmin.modules = append(ovpnAdmin.modules, "ccd")
 	}

-	if ovpnAdmin.role == "slave" {
-		ovpnAdmin.syncDataFromMaster()
-		go ovpnAdmin.syncWithMaster()
-	}
-
 	ovpnAdmin.templates = packr.New("template", "./templates")

 	staticBox := packr.New("static", "./frontend/static")
--- a/setup/configure.sh
+++ b/setup/configure.sh
@ -15,7 +15,7 @@ if [ -e "$SERVER_CERT" ]; then
 else
  if [ ${OVPN_ROLE:-"master"} = "slave" ]; then
    echo "Waiting for initial sync data from master"
-    while [ $(wget -q localhost/api/sync/last/try -O - | wc -m) -lt 1 ]
+    while [ $(wget -q localhost:${OVPN_LISTEN_PORT:-8080}/api/sync/last/try -O - | wc -m) -lt 1 ]
    do
      sleep 5
    done
Author	SHA1	Message	Date
Pmoranga	8b45188944	Merge 213e1d7b0f0981e68e4181b7c209a984b710eb6e into 2edd30798db5764a391f87645175805f7a00c894	2025-07-14 13:45:48 +03:00
Dmitry Shurupov	2edd30798d	Merge pull request #377 from palark/dependabot/docker/golang-1.24.5-bullseye Bump golang from 1.24.4-bullseye to 1.24.5-bullseye	2025-07-14 11:10:39 +07:00
dependabot[bot]	6d679b3ec1	Bump golang from 1.24.4-bullseye to 1.24.5-bullseye Bumps golang from 1.24.4-bullseye to 1.24.5-bullseye. --- updated-dependencies: - dependency-name: golang dependency-version: 1.24.5-bullseye dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-14 02:36:08 +00:00
Dmitry Shurupov	efca43410c	Merge pull request #374 from palark/dependabot/go_modules/k8s.io/client-go-0.33.2 Bump k8s.io/client-go from 0.33.1 to 0.33.2	2025-07-08 16:48:40 +07:00
dependabot[bot]	cb864f5420	Bump k8s.io/client-go from 0.33.1 to 0.33.2 Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.33.1 to 0.33.2. - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.33.1...v0.33.2) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-version: 0.33.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-23 02:39:52 +00:00
Pmoranga	213e1d7b0f	Fix Replication Fixes issue when set to `slave` mode, also fix creation of subdirectories from the assets received and fix probe port when waiting to slave process to finish.	2023-04-19 19:00:46 -03:00