Switch to apiman.io annotation fabric8io#349

KurtStam · Jun 9, 2016 · b8dde5d · b8dde5d
1 parent fde8ddc
commit b8dde5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apiman/src/main/java/io/fabric8/apiman/Kubernetes2ApimanMapper.java b/apiman/src/main/java/io/fabric8/apiman/Kubernetes2ApimanMapper.java
@@ -53,7 +53,7 @@ public AvailableApiBean createAvailableApiBean(Service service, Map<String,Strin
             bean = new AvailableApiBean();
             Map<String,String> annotations = service.getMetadata().getAnnotations();
             String port = "";
-            if (service.getSpec().getPorts().size() > 0) port = String.valueOf(service.getSpec().getPorts().get(0).getPort());
+            if (service.getSpec().getPorts().size() > 0) port = String.valueOf(service.getSpec().getPorts().get(0).getTargetPort().getIntVal());
             String scheme = "http";
             if (annotations!=null && annotations.containsKey(SERVICE_SCHEME)) {
                 scheme = annotations.get(SERVICE_SCHEME);

diff --git a/apiman/src/main/java/io/fabric8/apiman/rest/Kubernetes2ApimanFilter.java b/apiman/src/main/java/io/fabric8/apiman/rest/Kubernetes2ApimanFilter.java
@@ -372,8 +372,8 @@ private boolean isServiceReady(AvailableApiBean bean) {
 
     private boolean isServiceRegisterToApiman(Service service) {
         Map<String,String> annotations = service.getMetadata().getAnnotations();
-        if (annotations!=null && annotations.containsKey(OPENSHIFT_API_MANAGER)) {
-            return "apiman".equalsIgnoreCase(annotations.get(OPENSHIFT_API_MANAGER));
+        if (annotations!=null && annotations.containsKey(APIMAN_PUBLISH)) {
+            return true;
         }
         return false;
     }