Merge pull request #3499 from deads2k/fix-example-rc

Merged by openshift-bot
openshift · Jun 29, 2015 · 262dd14 · 262dd14
2 parents fdb660f + 553e9b5
commit 262dd14
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/test/fixtures/app-scenarios/k8s-sample-app.json b/test/fixtures/app-scenarios/k8s-sample-app.json
@@ -16,14 +16,16 @@
       "spec": {
         "replicas": 1,
         "selector": {
-          "name": "database"
+          "name": "database",
+          "deconflict": "database.app"
         },
         "template": {
           "metadata": {
             "creationTimestamp": null,
             "labels": {
               "name": "database",
-              "template": "ruby-helloworld-sample"
+              "template": "ruby-helloworld-sample",
+              "deconflict": "database.app"
             }
           },
           "spec": {
@@ -79,14 +81,16 @@
       "spec": {
         "replicas": 3,
         "selector": {
-          "name": "frontend"
+          "name": "frontend",
+          "deconflict": "frontend.app"
         },
         "template": {
           "metadata": {
             "creationTimestamp": null,
             "labels": {
               "name": "frontend",
-              "template": "ruby-helloworld-sample"
+              "template": "ruby-helloworld-sample",
+              "deconflict": "frontend.app"
             }
           },
           "spec": {

diff --git a/test/fixtures/app-scenarios/k8s-unserviced-rc.json b/test/fixtures/app-scenarios/k8s-unserviced-rc.json
@@ -16,14 +16,16 @@
       "spec": {
         "replicas": 1,
         "selector": {
-          "name": "database"
+          "name": "database",
+          "deconflict": "database.rc"
         },
         "template": {
           "metadata": {
             "creationTimestamp": null,
             "labels": {
               "name": "database",
-              "template": "ruby-helloworld-sample"
+              "template": "ruby-helloworld-sample",
+              "deconflict": "database.rc"
             }
           },
           "spec": {
@@ -79,14 +81,16 @@
       "spec": {
         "replicas": 3,
         "selector": {
-          "name": "frontend"
+          "name": "frontend",
+          "deconflict": "frontend.rc"
         },
         "template": {
           "metadata": {
             "creationTimestamp": null,
             "labels": {
               "name": "frontend",
-              "template": "ruby-helloworld-sample"
+              "template": "ruby-helloworld-sample",
+              "deconflict": "frontend.rc"
             }
           },
           "spec": {