mirror of
https://github.com/stakater/Reloader.git
synced 2026-02-14 18:09:50 +00:00
Add Edition variable in metadata
This commit is contained in:
6
.github/workflows/pull_request.yaml
vendored
6
.github/workflows/pull_request.yaml
vendored
@@ -22,6 +22,7 @@ env:
|
|||||||
KUBERNETES_VERSION: "1.30.0"
|
KUBERNETES_VERSION: "1.30.0"
|
||||||
KIND_VERSION: "0.23.0"
|
KIND_VERSION: "0.23.0"
|
||||||
REGISTRY: ghcr.io
|
REGISTRY: ghcr.io
|
||||||
|
RELOADER_EDITION: oss
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
qa:
|
qa:
|
||||||
@@ -154,6 +155,7 @@ jobs:
|
|||||||
VERSION=merge-${{ steps.generate_tag.outputs.GIT_TAG }}
|
VERSION=merge-${{ steps.generate_tag.outputs.GIT_TAG }}
|
||||||
COMMIT=${{github.event.pull_request.head.sha}}
|
COMMIT=${{github.event.pull_request.head.sha}}
|
||||||
BUILD_DATE=${{ steps.prep.outputs.created }}
|
BUILD_DATE=${{ steps.prep.outputs.created }}
|
||||||
|
EDITION=${{ env.RELOADER_EDITION }}
|
||||||
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
|
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
|
||||||
|
|
||||||
cache-to: type=inline
|
cache-to: type=inline
|
||||||
@@ -173,6 +175,10 @@ jobs:
|
|||||||
pull: true
|
pull: true
|
||||||
push: false
|
push: false
|
||||||
build-args: |
|
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 }}
|
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
|
||||||
BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.highest_tag.outputs.tag }}
|
BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.highest_tag.outputs.tag }}
|
||||||
cache-to: type=inline
|
cache-to: type=inline
|
||||||
|
|||||||
9
.github/workflows/push.yaml
vendored
9
.github/workflows/push.yaml
vendored
@@ -15,6 +15,7 @@ env:
|
|||||||
KIND_VERSION: "0.23.0"
|
KIND_VERSION: "0.23.0"
|
||||||
HELM_REGISTRY_URL: "https://stakater.github.io/stakater-charts"
|
HELM_REGISTRY_URL: "https://stakater.github.io/stakater-charts"
|
||||||
REGISTRY: ghcr.io
|
REGISTRY: ghcr.io
|
||||||
|
RELOADER_EDITION: oss
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@@ -103,7 +104,12 @@ jobs:
|
|||||||
file: ${{ env.DOCKER_FILE_PATH }}
|
file: ${{ env.DOCKER_FILE_PATH }}
|
||||||
pull: true
|
pull: true
|
||||||
push: 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
|
cache-to: type=inline
|
||||||
platforms: linux/amd64,linux/arm,linux/arm64
|
platforms: linux/amd64,linux/arm,linux/arm64
|
||||||
tags: |
|
tags: |
|
||||||
@@ -152,6 +158,7 @@ jobs:
|
|||||||
VERSION=merge-${{ github.event.number }}
|
VERSION=merge-${{ github.event.number }}
|
||||||
COMMIT=${{ github.sha }}
|
COMMIT=${{ github.sha }}
|
||||||
BUILD_DATE=${{ steps.prep.outputs.created }}
|
BUILD_DATE=${{ steps.prep.outputs.created }}
|
||||||
|
EDITION=${{ env.RELOADER_EDITION }}
|
||||||
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
|
BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
|
||||||
cache-to: type=inline
|
cache-to: type=inline
|
||||||
platforms: linux/amd64,linux/arm,linux/arm64
|
platforms: linux/amd64,linux/arm,linux/arm64
|
||||||
|
|||||||
3
.github/workflows/release.yaml
vendored
3
.github/workflows/release.yaml
vendored
@@ -11,6 +11,7 @@ env:
|
|||||||
KUBERNETES_VERSION: "1.30.0"
|
KUBERNETES_VERSION: "1.30.0"
|
||||||
KIND_VERSION: "0.23.0"
|
KIND_VERSION: "0.23.0"
|
||||||
REGISTRY: ghcr.io
|
REGISTRY: ghcr.io
|
||||||
|
RELOADER_EDITION: oss
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
@@ -110,6 +111,7 @@ jobs:
|
|||||||
VERSION=${{ steps.generate_tag.outputs.RELEASE_VERSION }}
|
VERSION=${{ steps.generate_tag.outputs.RELEASE_VERSION }}
|
||||||
COMMIT=${{ github.sha }}
|
COMMIT=${{ github.sha }}
|
||||||
BUILD_DATE=${{ steps.prep.outputs.created }}
|
BUILD_DATE=${{ steps.prep.outputs.created }}
|
||||||
|
EDITION=${{ env.RELOADER_EDITION }}
|
||||||
labels: |
|
labels: |
|
||||||
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
|
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
|
||||||
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
|
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
|
||||||
@@ -160,6 +162,7 @@ jobs:
|
|||||||
VERSION=${{ steps.generate_tag.outputs.RELEASE_VERSION }}
|
VERSION=${{ steps.generate_tag.outputs.RELEASE_VERSION }}
|
||||||
COMMIT=${{ github.sha }}
|
COMMIT=${{ github.sha }}
|
||||||
BUILD_DATE=${{ steps.prep.outputs.created }}
|
BUILD_DATE=${{ steps.prep.outputs.created }}
|
||||||
|
EDITION=${{ env.RELOADER_EDITION }}
|
||||||
labels: |
|
labels: |
|
||||||
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
|
org.opencontainers.image.source=${{ github.event.repository.clone_url }}
|
||||||
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
|
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ ARG GOPRIVATE
|
|||||||
ARG COMMIT
|
ARG COMMIT
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
ARG EDITION
|
||||||
|
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
|
|
||||||
@@ -36,7 +37,8 @@ RUN CGO_ENABLED=0 \
|
|||||||
GO111MODULE=on \
|
GO111MODULE=on \
|
||||||
go build -ldflags="-s -w -X github.com/stakater/Reloader/pkg/common.Version=${VERSION} \
|
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.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 ./
|
-installsuffix 'static' -mod=mod -a -o manager ./
|
||||||
|
|
||||||
# Use distroless as minimal base image to package the manager binary
|
# Use distroless as minimal base image to package the manager binary
|
||||||
|
|||||||
2
go.mod
2
go.mod
@@ -15,7 +15,6 @@ require (
|
|||||||
k8s.io/apimachinery v0.35.0
|
k8s.io/apimachinery v0.35.0
|
||||||
k8s.io/client-go v0.35.0
|
k8s.io/client-go v0.35.0
|
||||||
k8s.io/kubectl 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
|
sigs.k8s.io/secrets-store-csi-driver v1.5.5
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -65,6 +64,7 @@ require (
|
|||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/klog/v2 v2.130.1 // indirect
|
k8s.io/klog/v2 v2.130.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // 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/json v0.0.0-20250730193827-2d320260d730 // indirect
|
||||||
sigs.k8s.io/randfill v1.0.0 // indirect
|
sigs.k8s.io/randfill v1.0.0 // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
|
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
|
||||||
|
|||||||
@@ -18,11 +18,12 @@ import (
|
|||||||
var Version = "dev"
|
var Version = "dev"
|
||||||
var Commit = "unknown"
|
var Commit = "unknown"
|
||||||
var BuildDate = "unknown"
|
var BuildDate = "unknown"
|
||||||
|
var Edition = "oss"
|
||||||
|
|
||||||
const (
|
const (
|
||||||
MetaInfoConfigmapName = "reloader-meta-info"
|
MetaInfoConfigmapName = "reloader-meta-info"
|
||||||
MetaInfoConfigmapLabelKey = "reloader.stakater.com/meta-info"
|
MetaInfoConfigmapLabelKey = "reloader.stakater.com/meta-info"
|
||||||
MetaInfoConfigmapLabelValue = "reloader-oss"
|
MetaInfoConfigmapLabelValue = "reloader"
|
||||||
)
|
)
|
||||||
|
|
||||||
// MetaInfo contains comprehensive metadata about the Reloader instance.
|
// MetaInfo contains comprehensive metadata about the Reloader instance.
|
||||||
@@ -47,6 +48,9 @@ type BuildInfo struct {
|
|||||||
CommitHash string `json:"commitHash"`
|
CommitHash string `json:"commitHash"`
|
||||||
// CommitTime is the timestamp of the Git commit used to build this binary
|
// CommitTime is the timestamp of the Git commit used to build this binary
|
||||||
CommitTime time.Time `json:"commitTime"`
|
CommitTime time.Time `json:"commitTime"`
|
||||||
|
|
||||||
|
// Edition indicates the edition of Reloader (e.g., OSS, Enterprise)
|
||||||
|
Edition string `json:"edition"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewBuildInfo() *BuildInfo {
|
func NewBuildInfo() *BuildInfo {
|
||||||
@@ -55,6 +59,7 @@ func NewBuildInfo() *BuildInfo {
|
|||||||
ReleaseVersion: Version,
|
ReleaseVersion: Version,
|
||||||
CommitHash: Commit,
|
CommitHash: Commit,
|
||||||
CommitTime: ParseUTCTime(BuildDate),
|
CommitTime: ParseUTCTime(BuildDate),
|
||||||
|
Edition: Edition,
|
||||||
}
|
}
|
||||||
|
|
||||||
return metaInfo
|
return metaInfo
|
||||||
|
|||||||
Reference in New Issue
Block a user