Shorten executor kubernetes objects name (#975)
This commit is contained in:
+17
-10
@@ -157,12 +157,7 @@ func MakeGenericPool(
|
||||
}
|
||||
|
||||
// Labels for generic deployment/RS/pods.
|
||||
gp.labelsForPool = map[string]string{
|
||||
"environmentName": gp.env.Metadata.Name,
|
||||
"environmentUid": string(gp.env.Metadata.UID),
|
||||
fission.EXECUTOR_INSTANCEID_LABEL: gp.instanceId,
|
||||
"executorType": fission.ExecutorTypePoolmgr,
|
||||
}
|
||||
gp.labelsForPool = gp.getDeployLabels()
|
||||
|
||||
// create the pool
|
||||
err = gp.createPool()
|
||||
@@ -176,6 +171,16 @@ func MakeGenericPool(
|
||||
return gp, nil
|
||||
}
|
||||
|
||||
func (gp *GenericPool) getDeployLabels() map[string]string {
|
||||
return map[string]string{
|
||||
fission.EXECUTOR_INSTANCEID_LABEL: gp.instanceId,
|
||||
fission.EXECUTOR_TYPE: fission.ExecutorTypePoolmgr,
|
||||
fission.ENVIRONMENT_NAME: gp.env.Metadata.Name,
|
||||
fission.ENVIRONMENT_NAMESPACE: gp.env.Metadata.Namespace,
|
||||
fission.ENVIRONMENT_UID: string(gp.env.Metadata.UID),
|
||||
}
|
||||
}
|
||||
|
||||
// choosePodService serializes the choosing of pods
|
||||
func (gp *GenericPool) choosePodService() {
|
||||
for {
|
||||
@@ -456,12 +461,14 @@ func (gp *GenericPool) specializePod(pod *apiv1.Pod, metadata *metav1.ObjectMeta
|
||||
return nil
|
||||
}
|
||||
|
||||
func (gp *GenericPool) getPoolName() string {
|
||||
return strings.ToLower(fmt.Sprintf("poolmgr-%v-%v-%v",
|
||||
gp.env.Metadata.Name, gp.env.Metadata.Namespace, uniuri.NewLen(8)))
|
||||
}
|
||||
|
||||
// A pool is a deployment of generic containers for an env. This
|
||||
// creates the pool but doesn't wait for any pods to be ready.
|
||||
func (gp *GenericPool) createPool() error {
|
||||
poolDeploymentName := fmt.Sprintf("%v-%v-%v",
|
||||
gp.env.Metadata.Name, gp.env.Metadata.UID, strings.ToLower(gp.poolInstanceId))
|
||||
|
||||
fetcherResources, err := util.GetFetcherResources()
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -484,7 +491,7 @@ func (gp *GenericPool) createPool() error {
|
||||
|
||||
deployment := &v1beta1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: poolDeploymentName,
|
||||
Name: gp.getPoolName(),
|
||||
Labels: gp.labelsForPool,
|
||||
},
|
||||
Spec: v1beta1.DeploymentSpec{
|
||||
|
||||
Reference in New Issue
Block a user