Merge branch 'main' into release

Author: synarete

.github/workflows/main.yml

@@ -14,20 +14,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
         with:
           go-version: "stable"
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Build
         run: make
   # Run static/code-quality checks
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
         with:
           go-version: "stable"
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Install build tools
         run: make build-tools
       - name: Run checks
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -48,10 +48,10 @@ jobs:
     needs: [build, check]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
         with:
           go-version: "stable"
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Run tests
         run: make test
   podmanbuild:
@@ -60,7 +60,7 @@ jobs:
     # image build step, so no need to do it twice.
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Install fuse-overlayfs
         run: sudo apt-get -y install fuse-overlayfs
       - name: Setup podman config
@@ -88,7 +88,7 @@ jobs:
     # image build step, so no need to do it twice.
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: build container image
         # note: forcing use of podman here since we are
         # using podman explicitly for the push job
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: log in to quay.io
         # using docker for now, since podman has an issue with space
         # consumption: image build fails with no space left on device...

Dockerfile

@@ -1,12 +1,11 @@
-# Args
 ARG BASE_IMG="quay.io/samba.org/samba-server:latest"
+
+# Build smbmetrics
+FROM docker.io/golang:1.25 AS builder
 ARG GIT_VERSION="(unset)"
 ARG COMMIT_ID="(unset)"
 ARG ARCH=""
 
-# Build smbmetrics
-FROM docker.io/golang:1.24 AS builder
-
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod

docs/release-process.md

@@ -25,18 +25,17 @@ git merge main
 ```
 
 Now we need to "pin" the appropriate version of the samba-server container
-dependency.  Edit `Dockerfile` and change the tag part of the "FROM" line with
-the `quay.io/samba.org/samba-server` image repository to use the latest
-released samba-server tag.
+dependency. Ensure that you use the proper base samba-server image (default:
+`quay.io/samba.org/samba-server`) and latest released samba-server tag.
 
 At this point, an optional but recommended step is to do a test build before
-tagging.  Run `make image-build`.
+tagging.  Run `make BASE_IMG_TAG=v0.7 image-build`.
 
 If you are happy with the content of the `release` branch, tag it. Example:
 
 ```
 git checkout release
-git tag -a -m 'Release v0.5' v0.5
+git tag -a -m 'Release v0.7' v0.7
 ```
 
 This creates an annotated tag. Release tags must be annotated tags.
@@ -53,18 +52,19 @@ is recommended to purge your local container engine of cached images
 
 Build the images from scratch. Example:
 ```
-make image-build
+make BASE_IMG_TAG=v0.7 image-build
 ```
 
 For the image that was just built, apply a temporary pre-release tag
 to it. Example:
 ```
-podman tag quay.io/samba.org/samba-metrics:{latest,v0.5pre1}
+export IMG_TAG=v0.7
+podman tag quay.io/samba.org/samba-metrics:{${IMG_TAG},${IMG_TAG}pre1}
 ```
 
 Log into quay.io.  Push the images to quay.io using the temporary tag. Example:
 ```
-podman push quay.io/samba.org/samba-metrics:{latest,v0.5pre1}
+podman push quay.io/samba.org/samba-metrics:{${IMG_TAG},${IMG_TAG}pre1}
 ```
 
 Wait for the security scan to complete. There shouldn't be any issues if you
@@ -100,8 +100,8 @@ Use the following partial snippet as an example:
 
 Images built for this release can be obtained from the quay.io image registry.
 
-* By tag: quay.io/samba.org/samba-metrics:v0.5
-* By digest: quay.io/samba.org/samba-metrics@sha256:09c867343af39b237230f94a734eacc8313f2330c7d934994522ced46b740715
+* By tag: quay.io/samba.org/samba-metrics:v0.7
+* By digest: quay.io/samba.org/samba-metrics@sha256:aaaa17c124ca310177abc00bcb9c3a0cf20e52c8728afee13cd66eb7e472b164
 ```
 ... using the image that was pushed earlier
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/samba-in-kubernetes/smbmetrics
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/go-logr/logr v1.2.3

hack/install-tools.sh

@@ -46,7 +46,7 @@ _install_revive() {
 }
 
 _install_golangci_lint() {
-	_install_tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6
+	_install_tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.1
 }
 
 _install_yq() {