| ... | ... |
@@ -337,7 +337,7 @@ func (d *LatestDeploymentsDescriber) Describe(namespace, name string) (string, e |
| 337 | 337 |
|
| 338 | 338 |
var deployments []kapi.ReplicationController |
| 339 | 339 |
if d.count == -1 || d.count > 1 {
|
| 340 |
- list, err := d.kubeClient.ReplicationControllers(namespace).List(kapi.ListOptions{LabelSelector: labels.Set(config.Spec.Selector).AsSelector()})
|
|
| 340 |
+ list, err := d.kubeClient.ReplicationControllers(namespace).List(kapi.ListOptions{LabelSelector: deployutil.ConfigSelector(name)})
|
|
| 341 | 341 |
if err != nil && !kerrors.IsNotFound(err) {
|
| 342 | 342 |
return "", err |
| 343 | 343 |
} |
| ... | ... |
@@ -272,7 +272,8 @@ os::cmd::expect_success_and_text "oc exec -p ${frontend_pod} id" '1000'
|
| 272 | 272 |
os::cmd::expect_success_and_text "oc rsh pod/${frontend_pod} id -u" '1000'
|
| 273 | 273 |
os::cmd::expect_success_and_text "oc rsh -T ${frontend_pod} id -u" '1000'
|
| 274 | 274 |
# Test retrieving application logs from dc |
| 275 |
-oc logs dc/frontend | grep "Connecting to production database" |
|
| 275 |
+os::cmd::expect_success_and_text "oc logs dc/frontend" 'Connecting to production database' |
|
| 276 |
+os::cmd::expect_success_and_text "oc deploy frontend" 'deployed' |
|
| 276 | 277 |
|
| 277 | 278 |
# Port forwarding |
| 278 | 279 |
echo "[INFO] Validating port-forward" |