Compare commits

...

13 Commits

Author SHA1 Message Date
Muhammad Safwan Karim
9aa957c839 Merge pull request #1096 from stakater/chart/release-1.4.13
Bump chart and version for 1.4.13
2026-02-14 00:12:29 +05:00
Safwan
20e2680539 Bump chart and version 2026-02-13 21:44:45 +05:00
Felix Tonnvik
f51b62dee9 Merge pull request #1094 from stakater/fix/bump-go-ver
Bump go version to 1.26
2026-02-13 14:26:45 +01:00
Safwan
f776e2dfd0 fixed errors 2026-02-13 17:05:29 +05:00
Safwan
003fbbfa1f Bump go version to 1.26 2026-02-13 15:53:18 +05:00
Felix Tonnvik
8834ab097d Merge pull request #1082 from stakater/edition-variable
Add Edition variable in metadata
2026-02-13 11:27:52 +01:00
Safwan
3ee87d3725 resolved comments 2026-01-20 16:26:48 +05:00
Safwan
5c3593fb1c revert values.yaml 2026-01-13 00:59:51 +05:00
Safwan
8537502bbd revert extra changes 2026-01-13 00:41:12 +05:00
Safwan
fd5f03adfb disable testing temporarily 2026-01-13 00:24:39 +05:00
Safwan
32899e1983 login to registry 2026-01-13 00:17:22 +05:00
Safwan
6c15e5db24 test by pushing images 2026-01-12 23:29:16 +05:00
Safwan
4a95a813cd Add Edition variable in metadata 2026-01-12 23:02:26 +05:00
14 changed files with 42 additions and 19 deletions

View File

@@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.25'
go-version: '1.26'
cache: false
- name: Set up Docker Buildx

View File

@@ -22,6 +22,7 @@ env:
KUBERNETES_VERSION: "1.30.0"
KIND_VERSION: "0.23.0"
REGISTRY: ghcr.io
RELOADER_EDITION: oss
jobs:
qa:
@@ -154,6 +155,7 @@ jobs:
VERSION=merge-${{ steps.generate_tag.outputs.GIT_TAG }}
COMMIT=${{github.event.pull_request.head.sha}}
BUILD_DATE=${{ steps.prep.outputs.created }}
EDITION=${{ env.RELOADER_EDITION }}
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
cache-to: type=inline
@@ -173,6 +175,10 @@ jobs:
pull: true
push: false
build-args: |
VERSION=merge-${{ steps.generate_tag.outputs.GIT_UBI_TAG }}
COMMIT=${{github.event.pull_request.head.sha}}
BUILD_DATE=${{ steps.prep.outputs.created }}
EDITION=${{ env.RELOADER_EDITION }}
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.highest_tag.outputs.tag }}
cache-to: type=inline

View File

@@ -15,6 +15,7 @@ env:
KIND_VERSION: "0.23.0"
HELM_REGISTRY_URL: "https://stakater.github.io/stakater-charts"
REGISTRY: ghcr.io
RELOADER_EDITION: oss
jobs:
build:
@@ -103,7 +104,12 @@ jobs:
file: ${{ env.DOCKER_FILE_PATH }}
pull: true
push: true
build-args: BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
build-args: |
VERSION=merge-${{ github.event.number }}
COMMIT=${{ github.sha }}
BUILD_DATE=${{ steps.prep.outputs.created }}
EDITION=${{ env.RELOADER_EDITION }}
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
cache-to: type=inline
platforms: linux/amd64,linux/arm,linux/arm64
tags: |
@@ -152,6 +158,7 @@ jobs:
VERSION=merge-${{ github.event.number }}
COMMIT=${{ github.sha }}
BUILD_DATE=${{ steps.prep.outputs.created }}
EDITION=${{ env.RELOADER_EDITION }}
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
cache-to: type=inline
platforms: linux/amd64,linux/arm,linux/arm64

View File

@@ -11,6 +11,7 @@ env:
KUBERNETES_VERSION: "1.30.0"
KIND_VERSION: "0.23.0"
REGISTRY: ghcr.io
RELOADER_EDITION: oss
jobs:
release:
@@ -110,6 +111,7 @@ jobs:
VERSION=${{ steps.generate_tag.outputs.RELEASE_VERSION }}
COMMIT=${{ github.sha }}
BUILD_DATE=${{ steps.prep.outputs.created }}
EDITION=${{ env.RELOADER_EDITION }}
labels: |
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
@@ -160,6 +162,7 @@ jobs:
VERSION=${{ steps.generate_tag.outputs.RELEASE_VERSION }}
COMMIT=${{ github.sha }}
BUILD_DATE=${{ steps.prep.outputs.created }}
EDITION=${{ env.RELOADER_EDITION }}
labels: |
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
org.opencontainers.image.created=${{ steps.prep.outputs.created }}

View File

@@ -2,7 +2,7 @@ ARG BUILDER_IMAGE
ARG BASE_IMAGE
# Build the manager binary
FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.25.5} AS builder
FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.26} AS builder
ARG TARGETOS
ARG TARGETARCH
@@ -12,6 +12,7 @@ ARG GOPRIVATE
ARG COMMIT
ARG VERSION
ARG BUILD_DATE
ARG EDITION=oss
WORKDIR /workspace
@@ -36,7 +37,8 @@ RUN CGO_ENABLED=0 \
GO111MODULE=on \
go build -ldflags="-s -w -X github.com/stakater/Reloader/pkg/common.Version=${VERSION} \
-X github.com/stakater/Reloader/pkg/common.Commit=${COMMIT} \
-X github.com/stakater/Reloader/pkg/common.BuildDate=${BUILD_DATE}" \
-X github.com/stakater/Reloader/pkg/common.BuildDate=${BUILD_DATE} \
-X github.com/stakater/Reloader/pkg/common.Edition=${EDITION}" \
-installsuffix 'static' -mod=mod -a -o manager ./
# Use distroless as minimal base image to package the manager binary

View File

@@ -1 +1 @@
1.4.12
1.4.13

View File

@@ -1,8 +1,8 @@
apiVersion: v1
name: reloader
description: Reloader chart that runs on kubernetes
version: 2.2.7
appVersion: v1.4.12
version: 2.2.8
appVersion: v1.4.13
keywords:
- Reloader
- kubernetes

View File

@@ -19,7 +19,7 @@ fullnameOverride: ""
image:
name: stakater/reloader
repository: ghcr.io/stakater/reloader
tag: v1.4.12
tag: v1.4.13
# digest: sha256:1234567
pullPolicy: IfNotPresent
@@ -133,7 +133,7 @@ reloader:
labels:
provider: stakater
group: com.stakater.platform
version: v1.4.12
version: v1.4.13
# Support for extra environment variables.
env:
# Open supports Key value pair as environment variables.

View File

@@ -17,7 +17,7 @@ spec:
app: reloader-reloader
spec:
containers:
- image: "ghcr.io/stakater/reloader:v1.4.12"
- image: "ghcr.io/stakater/reloader:v1.4.13"
imagePullPolicy: IfNotPresent
name: reloader-reloader
env:

View File

@@ -141,7 +141,7 @@ spec:
fieldPath: metadata.namespace
- name: RELOADER_DEPLOYMENT_NAME
value: reloader-reloader
image: ghcr.io/stakater/reloader:v1.4.12
image: ghcr.io/stakater/reloader:v1.4.13
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 5

4
go.mod
View File

@@ -1,6 +1,6 @@
module github.com/stakater/Reloader
go 1.25.5
go 1.26
require (
github.com/argoproj/argo-rollouts v1.8.3
@@ -15,7 +15,6 @@ require (
k8s.io/apimachinery v0.35.0
k8s.io/client-go v0.35.0
k8s.io/kubectl v0.35.0
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2
sigs.k8s.io/secrets-store-csi-driver v1.5.5
)
@@ -65,6 +64,7 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect

View File

@@ -45,7 +45,7 @@ func TestHealthz(t *testing.T) {
want := 200
if got != want {
t.Fatalf("got: %q, want: %q", got, want)
t.Fatalf("got: %d, want: %d", got, want)
}
// Have the liveness probe serve a 500
@@ -63,7 +63,7 @@ func TestHealthz(t *testing.T) {
want = 500
if got != want {
t.Fatalf("got: %q, want: %q", got, want)
t.Fatalf("got: %d, want: %d", got, want)
}
}
@@ -89,7 +89,7 @@ func TestRunLeaderElection(t *testing.T) {
want := 500
if got != want {
t.Fatalf("got: %q, want: %q", got, want)
t.Fatalf("got: %d, want: %d", got, want)
}
// Cancel the leader election context, so leadership is released and
@@ -108,7 +108,7 @@ func TestRunLeaderElection(t *testing.T) {
want = 500
if got != want {
t.Fatalf("got: %q, want: %q", got, want)
t.Fatalf("got: %d, want: %d", got, want)
}
}

View File

@@ -18,11 +18,12 @@ import (
var Version = "dev"
var Commit = "unknown"
var BuildDate = "unknown"
var Edition = "oss"
const (
MetaInfoConfigmapName = "reloader-meta-info"
MetaInfoConfigmapLabelKey = "reloader.stakater.com/meta-info"
MetaInfoConfigmapLabelValue = "reloader-oss"
MetaInfoConfigmapLabelValue = "reloader"
)
// MetaInfo contains comprehensive metadata about the Reloader instance.
@@ -47,6 +48,9 @@ type BuildInfo struct {
CommitHash string `json:"commitHash"`
// CommitTime is the timestamp of the Git commit used to build this binary
CommitTime time.Time `json:"commitTime"`
// Edition indicates the edition of Reloader (e.g., OSS, Enterprise)
Edition string `json:"edition"`
}
func NewBuildInfo() *BuildInfo {
@@ -55,6 +59,7 @@ func NewBuildInfo() *BuildInfo {
ReleaseVersion: Version,
CommitHash: Commit,
CommitTime: ParseUTCTime(BuildDate),
Edition: Edition,
}
return metaInfo

View File

@@ -1,6 +1,6 @@
module github.com/stakater/Reloader/test/loadtest
go 1.25
go 1.26
require (
github.com/spf13/cobra v1.8.1