Skip to content
Snippets Groups Projects
Commit fe7dd906 authored by Lucas Roesler's avatar Lucas Roesler Committed by Alex Ellis
Browse files

Remove code duplicated during a rebase

parent 156103e2
No related branches found
No related tags found
No related merge requests found
......@@ -82,12 +82,6 @@ func makeSpec(request *requests.CreateFunctionRequest, maxRestarts uint64, resta
} else {
constraints = linuxOnlyConstraints
}
labels := map[string]string{"function": "true"}
if request.Labels != nil {
for k, v := range request.Labels {
labels[k] = v
}
}
labels := map[string]string{
"com.openfaas.function": request.Service,
......@@ -135,10 +129,6 @@ func makeSpec(request *requests.CreateFunctionRequest, maxRestarts uint64, resta
Replicas: getMinReplicas(request),
},
},
Annotations: swarm.Annotations{
Name: request.Service,
Labels: labels,
},
}
// TODO: request.EnvProcess should only be set if it's not nil, otherwise we override anything in the Docker image already
......
......@@ -21,9 +21,6 @@ type CreateFunctionRequest struct {
// EnvVars provides overrides for functions.
EnvVars map[string]string `json:"envVars"`
// Secrets is a list of secrets required for the orchestration layer to provide
Secrets []string `json:"secrets"`
// RegistryAuth is the registry authentication (optional)
// in the same encoded format as Docker native credentials
// (see ~/.docker/config.json)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment