From d9e588cc6f002e62cd444fabbf824b29f56f5b34 Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Tue, 1 Jun 2021 12:14:22 +0200 Subject: [PATCH] Deprecate certServiceClient - disable certServiceClient submodule - set fixed version for certServiceClient image usage Issue-ID: OOM-2744 Signed-off-by: Remigiusz Janeczek Change-Id: Ibfca21ffe4310e7a5d124853c4b33c1c481f10a8 --- Makefile | 2 +- README.md | 6 +++--- certServiceClient/README.md | 6 +++++- pom.xml | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9a9da2c9..d48fd994 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ run-client: --mount type=bind,src=`pwd`/compose-resources/client-volume/,dst=/var/certs \ --volume `pwd`/certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks \ --volume `pwd`/certs/certServiceClient-keystore.jks:/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks \ - onap/org.onap.oom.platform.cert-service.oom-certservice-client:latest + nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.3 stop-backend: @echo "##### Stop Cert Service #####" diff --git a/README.md b/README.md index 0f4531f2..2d91ee8f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ More information about the project and all its functionalities you can find unde Project consists of four submodules: 1. oom-certservice-api -2. oom-certservice-client +2. *deprecated (no longer built)* oom-certservice-client 3. oom-certservice-post-processor 4. oom-certservice-k8s-external-provider @@ -41,8 +41,8 @@ Then execute following command from certs(!) directory: ``` ### Running Docker containers from docker-compose with EJBCA -Docker-compose uses a local image of certservice-api and make run-client uses a local image of certservice-client -Build docker images locally before running docker compose command. +Docker-compose uses a local image of certservice-api and make run-client uses a released image of certservice-client +Build certservice-api docker image locally before running docker compose command. ``` 1. Build local images make build diff --git a/certServiceClient/README.md b/certServiceClient/README.md index 63d9780b..98dcfb9b 100644 --- a/certServiceClient/README.md +++ b/certServiceClient/README.md @@ -1,4 +1,8 @@ -# Cert service client +# Cert service client *(deprecated)* + +> Deprecated since Istanbul release in favor of Cert Manager certificates +> (for more details see certServiceK8sExternalProvider submodule). + ### Project building ``` diff --git a/pom.xml b/pom.xml index 36690f83..e3d1f5af 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,6 @@ certService - certServiceClient certServicePostProcessor certServiceK8sExternalProvider -- 2.16.6