From 5d08203f1325faeff8842bff0b67cc74cd9455ed Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 7 May 2026 15:31:04 -0400 Subject: [PATCH] Hardcode VERSION to oadp-dev for standardised version reporting Previously VERSION was derived from git tags/describe, which produced opaque commit hashes. Hardcoding to the branch name (oadp-dev) gives users a meaningful version string via `oc oadp version`. Release branches update this value when cut (e.g., oadp-1.6). Signed-off-by: Joseph --- Containerfile.download | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.download b/Containerfile.download index d504be49..bc77f2dc 100644 --- a/Containerfile.download +++ b/Containerfile.download @@ -14,7 +14,7 @@ RUN go mod download && go mod verify COPY . . # Version information (OADP_VERSION avoids collision with Konflux-injected VERSION) -ARG OADP_VERSION=dev +ARG OADP_VERSION=oadp-dev ARG GIT_COMMIT=unknown # Build release binaries for all platforms as direct executables diff --git a/Makefile b/Makefile index 94d3865d..3b5586bb 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # Variables BINARY_NAME = kubectl-oadp INSTALL_PATH ?= $(HOME)/.local/bin -VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev") +VERSION ?= oadp-dev VELERO_NAMESPACE ?= openshift-adp ASSUME_DEFAULT ?= false