update crs to latest crd

grs · May 9, 2019 · bfe825f · bfe825f
1 parent 817f20f
commit bfe825f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 24 deletions.
diff --git a/client/client.html b/client/client.html
@@ -12,7 +12,7 @@
   <button id="clear" style="width:10%">Clear</button>
   <div id="responses"></div>
   <script>
-    var server = prompt("Enter details of server to use", "ws://localhost:8672");
+    var server = prompt("Enter details of server to use", "ws://console-cloud1.apps.cloud1.devcluster.openshift.com");
     var input = document.getElementById("request");
     var target = document.getElementById("address");
     var trigger = document.getElementById("send");

diff --git a/deploy/router/cloud1.yaml b/deploy/router/cloud1.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: interconnectedcloud.github.io/v1alpha1
-kind: Qdrouterd
+kind: Qdr
 metadata:
   name: cloud1
 spec:
@@ -11,8 +11,10 @@ spec:
     prefix: cloud1
   - distribution: closest
     prefix: closest
-  count: 2
-  deploymentMode: lbfrontend
+  deploymentPlan:
+    size: 2
+    placement: Any
+    role: interior
   interRouterListeners:
   - port: 55672
   listeners:

diff --git a/deploy/router/cloud2.yaml b/deploy/router/cloud2.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: interconnectedcloud.github.io/v1alpha1
-kind: Qdrouterd
+kind: Qdr
 metadata:
   name: cloud2
 spec:
@@ -11,8 +11,10 @@ spec:
     prefix: cloud2
   - distribution: closest
     prefix: closest
-  count: 2
-  deploymentMode: lbfrontend
+  deploymentPlan:
+    size: 2
+    placement: Any
+    role: interior
   interRouterListeners:
   - port: 55672
   interRouterConnectors:

diff --git a/deploy/router/dummy-setup b/deploy/router/dummy-setup
@@ -1,12 +1,12 @@
 BASE=$(dirname $0)
 ABSBASE=$(cd $BASE && pwd)
 
-wget -P /tmp https://raw.githubusercontent.com/interconnectedcloud/qdrouterd-operator/master/deploy/crds/interconnectedcloud_v1alpha1_qdrouterd_crd.yaml
+wget -P /tmp https://raw.githubusercontent.com/interconnectedcloud/qdr-operator/master/deploy/crds/interconnectedcloud_v1alpha1_qdr_crd.yaml
 for r in role role_binding service_account operator; do
-    wget -P /tmp https://raw.githubusercontent.com/interconnectedcloud/qdrouterd-operator/master/deploy/$r.yaml
+    wget -P /tmp https://raw.githubusercontent.com/interconnectedcloud/qdr-operator/master/deploy/$r.yaml
 done
 
-oc apply -f /tmp/interconnectedcloud_v1alpha1_qdrouterd_crd.yaml
+oc apply -f /tmp/interconnectedcloud_v1alpha1_qdr_crd.yaml
 for p in cloud1 cloud2 edge1 edge2 edge3; do
     oc new-project $p;
     oc apply -f /tmp/role.yaml;
@@ -16,7 +16,3 @@ for p in cloud1 cloud2 edge1 edge2 edge3; do
     oc apply -f $ABSBASE/$p.yaml;
 done
 
-# route create by operator doesn't work over plain http yet and tls has not yet been setup
-oc expose -n edge1 service edge1 --name http --port 8672
-oc expose -n cloud1 service cloud1 --name console --port 8672
-
diff --git a/deploy/router/edge1.yaml b/deploy/router/edge1.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: interconnectedcloud.github.io/v1alpha1
-kind: Qdrouterd
+kind: Qdr
 metadata:
   name: edge1
 spec:
@@ -11,8 +11,10 @@ spec:
     prefix: edge1
   - distribution: closest
     prefix: closest
-  count: 1
-  deploymentMode: lbfrontend
+  deploymentPlan:
+    size: 2
+    placement: Any
+    role: interior
   interRouterListeners:
   - port: 55672
   interRouterConnectors:

diff --git a/deploy/router/edge2.yaml b/deploy/router/edge2.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: interconnectedcloud.github.io/v1alpha1
-kind: Qdrouterd
+kind: Qdr
 metadata:
   name: edge2
 spec:
@@ -11,8 +11,10 @@ spec:
     prefix: edge2
   - distribution: closest
     prefix: closest
-  count: 1
-  deploymentMode: lbfrontend
+  deploymentPlan:
+    size: 2
+    placement: Any
+    role: interior
   interRouterListeners:
   - port: 55672
   interRouterConnectors:

diff --git a/deploy/router/edge3.yaml b/deploy/router/edge3.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: interconnectedcloud.github.io/v1alpha1
-kind: Qdrouterd
+kind: Qdr
 metadata:
   name: edge3
 spec:
@@ -11,8 +11,10 @@ spec:
     prefix: edge3
   - distribution: closest
     prefix: closest
-  count: 1
-  deploymentMode: lbfrontend
+  deploymentPlan:
+    size: 2
+    placement: Any
+    role: interior
   interRouterListeners:
   - port: 55672
   interRouterConnectors:

diff --git a/deploy/service/orange.yaml b/deploy/service/orange.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: orange-reverse
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       application: orange-reverse