Skip to content

Commit c96f970

Browse files
nirrozenbaumkfswain
authored andcommitted
moved build details to version package (kubernetes-sigs#1185)
Signed-off-by: Nir Rozenbaum <[email protected]>
1 parent 6d850cd commit c96f970

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ COPY cmd/epp ./cmd/epp
2121
COPY pkg/epp ./pkg/epp
2222
COPY internal ./internal
2323
COPY api ./api
24+
COPY version ./version
2425
WORKDIR /src/cmd/epp
25-
RUN go build -ldflags="-X sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics.CommitSHA=${COMMIT_SHA} -X sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics.BuildRef=${BUILD_REF}" -o /epp
26+
RUN go build -ldflags="-X sigs.k8s.io/gateway-api-inference-extension/version.CommitSHA=${COMMIT_SHA} -X sigs.k8s.io/gateway-api-inference-extension/version.BuildRef=${BUILD_REF}" -o /epp
2627

2728
## Multistage deploy
2829
FROM ${BASE_IMAGE}

cmd/epp/runner/runner.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import (
5050
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling"
5151
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
5252
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
53+
"sigs.k8s.io/gateway-api-inference-extension/version"
5354
)
5455

5556
var (
@@ -203,6 +204,8 @@ func (r *Runner) Run(ctx context.Context) error {
203204
flag.Parse()
204205
initLogging(&opts)
205206

207+
setupLog.Info("GIE build", "commit-sha", version.CommitSHA, "build-ref", version.BuildRef)
208+
206209
// Validate flags
207210
if err := validateFlags(); err != nil {
208211
setupLog.Error(err, "Failed to validate flags")
@@ -264,7 +267,7 @@ func (r *Runner) Run(ctx context.Context) error {
264267
// --- Setup Metrics Server ---
265268
customCollectors := []prometheus.Collector{collectors.NewInferencePoolMetricsCollector(datastore)}
266269
metrics.Register(customCollectors...)
267-
metrics.RecordInferenceExtensionInfo()
270+
metrics.RecordInferenceExtensionInfo(version.CommitSHA, version.BuildRef)
268271
// Register metrics handler.
269272
// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
270273
// More info:

pkg/epp/metrics/metrics.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ const (
3636
InferenceExtension = "inference_extension"
3737
)
3838

39-
var (
40-
// The git hash of the latest commit in the build.
41-
CommitSHA string
42-
43-
// The build ref from the _PULL_BASE_REF from cloud build trigger.
44-
BuildRef string
45-
)
46-
4739
var (
4840
// Inference Model Metrics
4941
requestCounter = prometheus.NewCounterVec(
@@ -437,6 +429,6 @@ func RecordPrefixCacheMatch(matchedLength, totalLength int) {
437429
}
438430
}
439431

440-
func RecordInferenceExtensionInfo() {
441-
InferenceExtensionInfo.WithLabelValues(CommitSHA, BuildRef).Set(1)
432+
func RecordInferenceExtensionInfo(commitSha, buildRef string) {
433+
InferenceExtensionInfo.WithLabelValues(commitSha, buildRef).Set(1)
442434
}

version/version.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ limitations under the License.
1616

1717
package version
1818

19+
var (
20+
// The git hash of the latest commit in the build.
21+
CommitSHA string
22+
23+
// The build ref from the _PULL_BASE_REF from cloud build trigger.
24+
BuildRef string
25+
)
26+
1927
const (
2028
// BundleVersionAnnotation is the annotation key used in the Gateway API inference extension CRDs to specify
2129
// the installed Gateway API inference extension version.

0 commit comments

Comments
 (0)