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
8b3e3950
Commit
8b3e3950
authored
Oct 10, 2017
by
Jeffrey Phillips
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Export makeParametersSecret and generateSecretName
parent
9cae4522
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
20 deletions
+28
-20
origin-web-common-services.js
dist/origin-web-common-services.js
+7
-5
origin-web-common.js
dist/origin-web-common.js
+7
-5
origin-web-common.min.js
dist/origin-web-common.min.js
+7
-5
bindService.js
src/services/bindService.js
+7
-5
No files found.
dist/origin-web-common-services.js
View file @
8b3e3950
...
@@ -1147,17 +1147,17 @@ angular.module("openshiftCommonServices")
...
@@ -1147,17 +1147,17 @@ angular.module("openshiftCommonServices")
return
generateName
(
secretNamePrefix
,
generateNameLength
);
return
generateName
(
secretNamePrefix
,
generateNameLength
);
};
};
var
makeParametersSecret
=
function
(
secretName
,
parameters
,
binding
)
{
var
makeParametersSecret
=
function
(
secretName
,
parameters
,
owner
)
{
var
secret
=
{
var
secret
=
{
apiVersion
:
'v1'
,
apiVersion
:
'v1'
,
kind
:
'Secret'
,
kind
:
'Secret'
,
metadata
:
{
metadata
:
{
name
:
secretName
,
name
:
secretName
,
ownerReferences
:
[{
ownerReferences
:
[{
apiVersion
:
binding
.
apiVersion
,
apiVersion
:
owner
.
apiVersion
,
kind
:
binding
.
kind
,
kind
:
owner
.
kind
,
name
:
binding
.
metadata
.
name
,
name
:
owner
.
metadata
.
name
,
uid
:
binding
.
metadata
.
uid
,
uid
:
owner
.
metadata
.
uid
,
controller
:
false
,
controller
:
false
,
// TODO: Change to true when garbage collection works with service
// TODO: Change to true when garbage collection works with service
// catalog resources. Setting to true now results in a 403 Forbidden
// catalog resources. Setting to true now results in a 403 Forbidden
...
@@ -1314,6 +1314,8 @@ angular.module("openshiftCommonServices")
...
@@ -1314,6 +1314,8 @@ angular.module("openshiftCommonServices")
return
{
return
{
bindingResource
:
bindingResource
,
bindingResource
:
bindingResource
,
getServiceClassForInstance
:
getServiceClassForInstance
,
getServiceClassForInstance
:
getServiceClassForInstance
,
makeParametersSecret
:
makeParametersSecret
,
generateSecretName
:
generateSecretName
,
// Create a binding for `serviceInstance`. If an `application` API object
// Create a binding for `serviceInstance`. If an `application` API object
// is specified, also create a pod preset for that application using its
// is specified, also create a pod preset for that application using its
...
...
dist/origin-web-common.js
View file @
8b3e3950
...
@@ -3164,17 +3164,17 @@ angular.module("openshiftCommonServices")
...
@@ -3164,17 +3164,17 @@ angular.module("openshiftCommonServices")
return
generateName
(
secretNamePrefix
,
generateNameLength
);
return
generateName
(
secretNamePrefix
,
generateNameLength
);
};
};
var
makeParametersSecret
=
function
(
secretName
,
parameters
,
binding
)
{
var
makeParametersSecret
=
function
(
secretName
,
parameters
,
owner
)
{
var
secret
=
{
var
secret
=
{
apiVersion
:
'v1'
,
apiVersion
:
'v1'
,
kind
:
'Secret'
,
kind
:
'Secret'
,
metadata
:
{
metadata
:
{
name
:
secretName
,
name
:
secretName
,
ownerReferences
:
[{
ownerReferences
:
[{
apiVersion
:
binding
.
apiVersion
,
apiVersion
:
owner
.
apiVersion
,
kind
:
binding
.
kind
,
kind
:
owner
.
kind
,
name
:
binding
.
metadata
.
name
,
name
:
owner
.
metadata
.
name
,
uid
:
binding
.
metadata
.
uid
,
uid
:
owner
.
metadata
.
uid
,
controller
:
false
,
controller
:
false
,
// TODO: Change to true when garbage collection works with service
// TODO: Change to true when garbage collection works with service
// catalog resources. Setting to true now results in a 403 Forbidden
// catalog resources. Setting to true now results in a 403 Forbidden
...
@@ -3331,6 +3331,8 @@ angular.module("openshiftCommonServices")
...
@@ -3331,6 +3331,8 @@ angular.module("openshiftCommonServices")
return
{
return
{
bindingResource
:
bindingResource
,
bindingResource
:
bindingResource
,
getServiceClassForInstance
:
getServiceClassForInstance
,
getServiceClassForInstance
:
getServiceClassForInstance
,
makeParametersSecret
:
makeParametersSecret
,
generateSecretName
:
generateSecretName
,
// Create a binding for `serviceInstance`. If an `application` API object
// Create a binding for `serviceInstance`. If an `application` API object
// is specified, also create a pod preset for that application using its
// is specified, also create a pod preset for that application using its
...
...
dist/origin-web-common.min.js
View file @
8b3e3950
...
@@ -1398,17 +1398,17 @@ length:DNS1123_SUBDOMAIN_VALIDATION.maxlength - generateNameLength - 1,
...
@@ -1398,17 +1398,17 @@ length:DNS1123_SUBDOMAIN_VALIDATION.maxlength - generateNameLength - 1,
omission
:
""
omission
:
""
});
});
return
generateName
(
secretNamePrefix
,
generateNameLength
);
return
generateName
(
secretNamePrefix
,
generateNameLength
);
},
makeParametersSecret
=
function
(
secretName
,
parameters
,
binding
)
{
},
makeParametersSecret
=
function
(
secretName
,
parameters
,
owner
)
{
var
secret
=
{
var
secret
=
{
apiVersion
:
"v1"
,
apiVersion
:
"v1"
,
kind
:
"Secret"
,
kind
:
"Secret"
,
metadata
:{
metadata
:{
name
:
secretName
,
name
:
secretName
,
ownerReferences
:[
{
ownerReferences
:[
{
apiVersion
:
binding
.
apiVersion
,
apiVersion
:
owner
.
apiVersion
,
kind
:
binding
.
kind
,
kind
:
owner
.
kind
,
name
:
binding
.
metadata
.
name
,
name
:
owner
.
metadata
.
name
,
uid
:
binding
.
metadata
.
uid
,
uid
:
owner
.
metadata
.
uid
,
controller
:
!
1
,
controller
:
!
1
,
blockOwnerDeletion
:
!
1
blockOwnerDeletion
:
!
1
}
]
}
]
...
@@ -1478,6 +1478,8 @@ return _.get(item, "metadata.name", "");
...
@@ -1478,6 +1478,8 @@ return _.get(item, "metadata.name", "");
return
{
return
{
bindingResource
:
bindingResource
,
bindingResource
:
bindingResource
,
getServiceClassForInstance
:
getServiceClassForInstance
,
getServiceClassForInstance
:
getServiceClassForInstance
,
makeParametersSecret
:
makeParametersSecret
,
generateSecretName
:
generateSecretName
,
bindService
:
function
(
serviceInstance
,
application
,
serviceClass
,
parameters
)
{
bindService
:
function
(
serviceInstance
,
application
,
serviceClass
,
parameters
)
{
var
parametersSecretName
;
var
parametersSecretName
;
_
.
isEmpty
(
parameters
)
||
(
parametersSecretName
=
generateSecretName
(
serviceInstance
.
metadata
.
name
+
"-bind-parameters-"
));
_
.
isEmpty
(
parameters
)
||
(
parametersSecretName
=
generateSecretName
(
serviceInstance
.
metadata
.
name
+
"-bind-parameters-"
));
...
...
src/services/bindService.js
View file @
8b3e3950
...
@@ -39,17 +39,17 @@ angular.module("openshiftCommonServices")
...
@@ -39,17 +39,17 @@ angular.module("openshiftCommonServices")
return
generateName
(
secretNamePrefix
,
generateNameLength
);
return
generateName
(
secretNamePrefix
,
generateNameLength
);
};
};
var
makeParametersSecret
=
function
(
secretName
,
parameters
,
binding
)
{
var
makeParametersSecret
=
function
(
secretName
,
parameters
,
owner
)
{
var
secret
=
{
var
secret
=
{
apiVersion
:
'v1'
,
apiVersion
:
'v1'
,
kind
:
'Secret'
,
kind
:
'Secret'
,
metadata
:
{
metadata
:
{
name
:
secretName
,
name
:
secretName
,
ownerReferences
:
[{
ownerReferences
:
[{
apiVersion
:
binding
.
apiVersion
,
apiVersion
:
owner
.
apiVersion
,
kind
:
binding
.
kind
,
kind
:
owner
.
kind
,
name
:
binding
.
metadata
.
name
,
name
:
owner
.
metadata
.
name
,
uid
:
binding
.
metadata
.
uid
,
uid
:
owner
.
metadata
.
uid
,
controller
:
false
,
controller
:
false
,
// TODO: Change to true when garbage collection works with service
// TODO: Change to true when garbage collection works with service
// catalog resources. Setting to true now results in a 403 Forbidden
// catalog resources. Setting to true now results in a 403 Forbidden
...
@@ -206,6 +206,8 @@ angular.module("openshiftCommonServices")
...
@@ -206,6 +206,8 @@ angular.module("openshiftCommonServices")
return
{
return
{
bindingResource
:
bindingResource
,
bindingResource
:
bindingResource
,
getServiceClassForInstance
:
getServiceClassForInstance
,
getServiceClassForInstance
:
getServiceClassForInstance
,
makeParametersSecret
:
makeParametersSecret
,
generateSecretName
:
generateSecretName
,
// Create a binding for `serviceInstance`. If an `application` API object
// Create a binding for `serviceInstance`. If an `application` API object
// is specified, also create a pod preset for that application using its
// is specified, also create a pod preset for that application using its
...
...
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