Fix ODS api service version (#1357)

* Add ODS_API_SERVICE_VERSION parameter to build configuration and Dockerfile

* changelog

Author: BraisVQ

CHANGELOG.md

@@ -3,7 +3,7 @@
 ## Unreleased
 
 ### Added
-- New core component, OpenDevStack API service ([#1356](https://github.com/opendevstack/ods-core/pull/1356))
+- New core component, OpenDevStack API service ([#1356](https://github.com/opendevstack/ods-core/pull/1356)) & ([#1357](https://github.com/opendevstack/ods-core/pull/1357))
 
 ### Changed
 - Change Cnes report to custom SonarQube report ([#1354](https://github.com/opendevstack/ods-core/pull/1354))

Makefile

@@ -189,7 +189,7 @@ install-ods-api-service: start-ods-api-service-build apply-ods-api-service-chart
 
 ## Start build of BuildConfig "Ods API Service".
 start-ods-api-service-build:
-	cd ods-api-service/build-config && oc process -f template.yaml -p ODS_NAMESPACE=$(ODS_NAMESPACE) -p ODS_IMAGE_TAG=$(ODS_IMAGE_TAG) -p BITBUCKET_URL=$(BITBUCKET_URL) -p ODS_BITBUCKET_PROJECT=$(ODS_BITBUCKET_PROJECT) -p ODS_GIT_REF=$(ODS_GIT_REF) | oc apply --namespace $(ODS_NAMESPACE) -f -
+	cd ods-api-service/build-config && oc process -f template.yaml -p ODS_NAMESPACE=$(ODS_NAMESPACE) -p ODS_IMAGE_TAG=$(ODS_IMAGE_TAG) -p BITBUCKET_URL=$(BITBUCKET_URL) -p ODS_BITBUCKET_PROJECT=$(ODS_BITBUCKET_PROJECT) -p ODS_GIT_REF=$(ODS_GIT_REF) -p ODS_API_SERVICE_VERSION=$(ODS_API_SERVICE_VERSION) | oc apply --namespace $(ODS_NAMESPACE) -f -
 	ocp-scripts/start-and-follow-build.sh --namespace $(ODS_NAMESPACE) --build-config ods-api-service
 .PHONY: start-ods-api-service-build
 

configuration-sample/ods-core.ods-api-service.env.sample

@@ -2,6 +2,10 @@
 # Global configuration for OpenDevStack Api Service #
 #####################################################
 
+# OpenDevStack Api Service Version
+# See https://github.com/opendevstack/ods-api-service/releases
+ODS_API_SERVICE_VERSION=0.0.1
+
 # JVM configuration
 JAVA_OPTS=-Xmx1g -Djavax.net.ssl.trustStore=/home/default/custom-truststore.jks -Djavax.net.ssl.trustStorePassword=changeit
 

ods-api-service/build-config/template.yaml

@@ -21,7 +21,7 @@ parameters:
   - name: ODS_GIT_REF
     description: "Git reference (branch or tag)"
     required: true
-  - name: API_SERVICE_VERSION
+  - name: ODS_API_SERVICE_VERSION
     description: "API Service version"
     required: false
     value: "latest"
@@ -72,8 +72,8 @@ objects:
           noCache: true
           forcePull: true
           buildArgs:
-            - name: API_SERVICE_VERSION
-              value: ${API_SERVICE_VERSION}
+            - name: ODS_API_SERVICE_VERSION
+              value: ${ODS_API_SERVICE_VERSION}
       postCommit: {}
       source:
         type: Git

ods-api-service/docker/Dockerfile

@@ -4,9 +4,9 @@ FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:latest
 # This applies for version from 2.10 and not below.
 ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
 
-ARG API_SERVICE_VERSION=latest
+ARG ODS_API_SERVICE_VERSION=latest
 
-RUN curl -L https://github.com/opendevstack/ods-api-service/releases/download/$API_SERVICE_VERSION/app.jar -o app.jar
+RUN curl -L https://github.com/opendevstack/ods-api-service/releases/download/v$ODS_API_SERVICE_VERSION/app.jar -o app.jar
 
 # Environment variable for certificate URLs (comma-separated) ENV CERT_URLS="" it is needed to install the certificates
 COPY install-certs.sh /opt/install-certs.sh