Merge pull request #184 from spadgett/bind-application-runtime-error

Fix runtime error binding to app

dist/origin-web-common-services.js

@@ -1131,6 +1131,7 @@ angular.module("openshiftCommonServices")
       var parametersSecretName;
       var instanceName = serviceInstance.metadata.name;
 
+      var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
       var binding = {
         kind: 'Binding',
         apiVersion: 'servicecatalog.k8s.io/v1alpha1',
@@ -1141,7 +1142,7 @@ angular.module("openshiftCommonServices")
           instanceRef: {
             name: instanceName
           },
-          secretName: generateSecretName(serviceInstance.metadata.name + '-credentials-')
+          secretName: credentialSecretName
         }
       };
 
@@ -1163,7 +1164,7 @@ angular.module("openshiftCommonServices")
           };
         }
         binding.spec.alphaPodPresetTemplate = {
-          name: relatedObjName,
+          name: credentialSecretName,
           selector: appSelector
         };
       }

dist/origin-web-common.js

@@ -3011,6 +3011,7 @@ angular.module("openshiftCommonServices")
       var parametersSecretName;
       var instanceName = serviceInstance.metadata.name;
 
+      var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
       var binding = {
         kind: 'Binding',
         apiVersion: 'servicecatalog.k8s.io/v1alpha1',
@@ -3021,7 +3022,7 @@ angular.module("openshiftCommonServices")
           instanceRef: {
             name: instanceName
           },
-          secretName: generateSecretName(serviceInstance.metadata.name + '-credentials-')
+          secretName: credentialSecretName
         }
       };
 
@@ -3043,7 +3044,7 @@ angular.module("openshiftCommonServices")
           };
         }
         binding.spec.alphaPodPresetTemplate = {
-          name: relatedObjName,
+          name: credentialSecretName,
           selector: appSelector
         };
       }

dist/origin-web-common.min.js

@@ -1217,7 +1217,7 @@ stringData:{}
 };
 return secret.stringData[PARAMETERS_SECRET_KEY] = JSON.stringify(parameters), secret;
 }, makeBinding = function(serviceInstance, application, parametersSecretName) {
-var parametersSecretName, instanceName = serviceInstance.metadata.name, binding = {
+var parametersSecretName, instanceName = serviceInstance.metadata.name, credentialSecretName = generateSecretName(serviceInstance.metadata.name + "-credentials-"), binding = {
 kind:"Binding",
 apiVersion:"servicecatalog.k8s.io/v1alpha1",
 metadata:{
@@ -1227,7 +1227,7 @@ spec:{
 instanceRef:{
 name:instanceName
 },
-secretName:generateSecretName(serviceInstance.metadata.name + "-credentials-")
+secretName:credentialSecretName
 }
 };
 parametersSecretName && (binding.spec.parametersFrom = [ {
@@ -1240,7 +1240,7 @@ var appSelector = _.get(application, "spec.selector");
 return appSelector && (appSelector.matchLabels || appSelector.matchExpressions || (appSelector = {
 matchLabels:appSelector
 }), binding.spec.alphaPodPresetTemplate = {
-name:relatedObjName,
+name:credentialSecretName,
 selector:appSelector
 }), binding;
 }, isServiceBindable = function(serviceInstance, serviceClasses) {

src/services/bindService.js

@@ -68,6 +68,7 @@ angular.module("openshiftCommonServices")
       var parametersSecretName;
       var instanceName = serviceInstance.metadata.name;
 
+      var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
       var binding = {
         kind: 'Binding',
         apiVersion: 'servicecatalog.k8s.io/v1alpha1',
@@ -78,7 +79,7 @@ angular.module("openshiftCommonServices")
           instanceRef: {
             name: instanceName
           },
-          secretName: generateSecretName(serviceInstance.metadata.name + '-credentials-')
+          secretName: credentialSecretName
         }
       };
 
@@ -100,7 +101,7 @@ angular.module("openshiftCommonServices")
           };
         }
         binding.spec.alphaPodPresetTemplate = {
-          name: relatedObjName,
+          name: credentialSecretName,
           selector: appSelector
         };
       }