Skip to content
Snippets Groups Projects
Commit 0eb8e219 authored by tranoris's avatar tranoris
Browse files

Merge branch '1-fix-dockerfile-target-lib-error' into 'develop'

fix reference and some extra documentation

See merge request !1
parents 9fd06b1b b7507bfd
No related branches found
No related tags found
2 merge requests!8Merging 2024Q2_RC into main, creating 2024Q2 Release,!1fix reference and some extra documentation
......@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
MAINTAINER openslice.io
RUN mkdir /opt/shareclasses
RUN mkdir -p /opt/openslice/lib/
COPY target/org.etsi.osl.tmf.api-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/
COPY target/org.etsi.osl.cridge-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.2.0-SNAPSHOT-exec.jar"]
......@@ -412,22 +412,22 @@ public class KubernetesClientResource {
logger.debug("============ Deploy crspec =============" );
logger.debug("Check if this CRIDGE instance is related to this deployment" );
logger.debug("Check if this CRIDGE instance is related to this kubernets cluster context" );
if ( (headers.get("currentContextCluster") ==null) ||
( ! headers.get("currentContextCluster").equals( kubernetesContextDefinition.getCurrentContextCluster() ))) {
(headers.get("clusterMasterURL") ==null) ||
( ! headers.get("currentContextCluster").equals( kubernetesContextDefinition.getCurrentContextCluster() )) ||
( ! headers.get("clusterMasterURL").equals( kubernetesContextDefinition.getMasterURL() ))) {
logger.debug("Will return SEE OTHER header={}, this.context= {}", headers.get("currentContextCluster"), kubernetesContextDefinition.getCurrentContextCluster() );
logger.debug("Will return SEE OTHER header.currentContextCluster={}, this.context= {} header.clusterMasterURLclusterMasterURL={}, this.context= {}",
headers.get("currentContextCluster"),
kubernetesContextDefinition.getCurrentContextCluster(),
headers.get("clusterMasterURL"),
kubernetesContextDefinition.getMasterURL() );
return "SEE OTHER";
}
if ( (headers.get("clusterMasterURL") ==null) ||
( ! headers.get("clusterMasterURL").equals( kubernetesContextDefinition.getMasterURL() ))) {
logger.debug("Will return SEE OTHER header={}, this.context= {}", headers.get("clusterMasterURL"), kubernetesContextDefinition.getMasterURL() );
return "SEE OTHER";
}
logger.debug("Deploy the following CR:" );
logger.debug("{}", crspec );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment