Commit 8b3e3950 by Jeffrey Phillips

Export makeParametersSecret and generateSecretName

parent 9cae4522
...@@ -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
......
...@@ -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
......
...@@ -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-"));
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment