From d0393fbaed211ca4394190adedec11ca7c84b164 Mon Sep 17 00:00:00 2001 From: Tommasso Borgato Date: Tue, 30 May 2023 15:41:31 +0200 Subject: [PATCH] Fix https://github.com/Intersmash/intersmash/issues/37: fix service labels --- .../openshift/DBImageOpenShiftProvisioner.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/DBImageOpenShiftProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/DBImageOpenShiftProvisioner.java index 821bb1492..c5bf40de2 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/DBImageOpenShiftProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/DBImageOpenShiftProvisioner.java @@ -80,7 +80,7 @@ public void deploy() { ApplicationBuilder appBuilder = ApplicationBuilder.fromImage(dbApplication.getName(), getImage(), Collections.singletonMap(APP_LABEL_KEY, dbApplication.getName())); - final DeploymentConfigBuilder builder = appBuilder.deploymentConfig(); + final DeploymentConfigBuilder builder = appBuilder.deploymentConfig(dbApplication.getName()); builder.podTemplate().container().envVars(getImageVariables()).port(getPort()); configureContainer(builder.podTemplate().container()); @@ -95,9 +95,9 @@ public void deploy() { new PVCBuilder(pvc.getClaimName()).accessRWX().storageSize("100Mi").build()); } - appBuilder.service().port(getPort()) + appBuilder.service(getServiceName()).port(getPort()) .addContainerSelector("deploymentconfig", dbApplication.getName()) - .addContainerSelector("app", dbApplication.getName()); + .addContainerSelector("name", dbApplication.getName()); customizeApplicationBuilder(appBuilder); @@ -141,14 +141,14 @@ public String getUrl(String routeName, boolean secure) { * @return service name to access the database */ public String getServiceName() { - return dbApplication.getName(); + return dbApplication.getName() + "-service"; } /** * @return name of the secret containing username and password for the database */ public String getSecretName() { - return dbApplication.getName(); + return dbApplication.getName() + "-credentials"; } }