Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
origin-web-common
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Java-于龙
origin-web-common
Commits
594d5c6f
Commit
594d5c6f
authored
Sep 12, 2017
by
Samuel Padgett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix runtime error binding to app
parent
4bcf671a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
9 deletions
+12
-9
origin-web-common-services.js
dist/origin-web-common-services.js
+3
-2
origin-web-common.js
dist/origin-web-common.js
+3
-2
origin-web-common.min.js
dist/origin-web-common.min.js
+3
-3
bindService.js
src/services/bindService.js
+3
-2
No files found.
dist/origin-web-common-services.js
View file @
594d5c6f
...
...
@@ -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
:
relatedObj
Name
,
name
:
credentialSecret
Name
,
selector
:
appSelector
};
}
...
...
dist/origin-web-common.js
View file @
594d5c6f
...
...
@@ -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
:
relatedObj
Name
,
name
:
credentialSecret
Name
,
selector
:
appSelector
};
}
...
...
dist/origin-web-common.min.js
View file @
594d5c6f
...
...
@@ -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
:
relatedObj
Name
,
name
:
credentialSecret
Name
,
selector
:
appSelector
}),
binding
;
},
isServiceBindable
=
function
(
serviceInstance
,
serviceClasses
)
{
...
...
src/services/bindService.js
View file @
594d5c6f
...
...
@@ -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
:
relatedObj
Name
,
name
:
credentialSecret
Name
,
selector
:
appSelector
};
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment