Update label constants to remove OF prefix

Signed-off-by: Lucas Roesler <[email protected]>

handlers/delete.go

@@ -66,7 +66,7 @@ func MakeDeleteHandler(functionNamespace string, clientset *kubernetes.Clientset
 
 func isFunction(deployment *v1beta1.Deployment) bool {
  if deployment != nil {
- if _, found := deployment.Labels[OFFunctionNameLabel]; found {
+ if _, found := deployment.Labels[FunctionNameLabel]; found {
  return true
  }
  }

handlers/deploy.go

@@ -193,7 +193,7 @@ func makeDeploymentSpec(request requests.CreateFunctionRequest, existingSecrets
  Spec: v1beta1.DeploymentSpec{
  Selector: &metav1.LabelSelector{
  MatchLabels: map[string]string{
- OFFunctionNameLabel: request.Service,
+ FunctionNameLabel: request.Service,
  },
  },
  Replicas: initialReplicas,
@@ -266,7 +266,7 @@ func makeServiceSpec(request requests.CreateFunctionRequest) *corev1.Service {
  Spec: corev1.ServiceSpec{
  Type: corev1.ServiceTypeClusterIP,
  Selector: map[string]string{
- OFFunctionNameLabel: request.Service,
+ FunctionNameLabel: request.Service,
  },
  Ports: []corev1.ServicePort{
  {

handlers/labels.go

@@ -10,13 +10,13 @@ const (
  // also used as the default return value for getMinReplicaCount
  initialReplicasCount = 1
 
- // OFFunctionNameLabel is the label key used by OpenFaaS to store the function name
+ // FunctionNameLabel is the label key used by OpenFaaS to store the function name
  // on the resources managed by OpenFaaS for that function. This key is also used to
  // denote that a resource is a "Function"
- OFFunctionNameLabel = "faas_function"
- // OFFunctionMinReplicaCount is a label that user's can set and will be passed to Kubernetes
+ FunctionNameLabel = "faas_function"
+ // FunctionMinReplicaCount is a label that user's can set and will be passed to Kubernetes
  // as the Deployment replicas value.
- OFFunctionMinReplicaCount = "com.openfaas.scale.min"
+ FunctionMinReplicaCount = "com.openfaas.scale.min"
 )
 
 // parseLabels will copy the user request labels and ensure that any required internal labels
@@ -29,7 +29,7 @@ func parseLabels(functionName string, requestLables *map[string]string) map[stri
  }
  }
 
- labels[OFFunctionNameLabel] = functionName
+ labels[FunctionNameLabel] = functionName
 
  return labels
 }
@@ -42,7 +42,7 @@ func getMinReplicaCount(labels *map[string]string) *int32 {
  }
 
  l := *labels
- if value, exists := l[OFFunctionMinReplicaCount]; exists {
+ if value, exists := l[FunctionMinReplicaCount]; exists {
  minReplicas, err := strconv.Atoi(value)
  if err == nil && minReplicas > 0 {
  return int32p(int32(minReplicas))

handlers/lables_test.go

@@ -20,7 +20,7 @@ func Test_getMinReplicaCount(t *testing.T) {
  },
  {
  name: "empty map returns default",
- labels: &map[string]string{OFFunctionMinReplicaCount: "2"},
+ labels: &map[string]string{FunctionMinReplicaCount: "2"},
  output: 2,
  },
  }
@@ -51,19 +51,19 @@ func Test_parseLabels(t *testing.T) {
  name: "nil map returns just the function name",
  labels: nil,
  functionName: "testFunc",
- output: map[string]string{OFFunctionNameLabel: "testFunc"},
+ output: map[string]string{FunctionNameLabel: "testFunc"},
  },
  {
  name: "empty map returns just the function name",
  labels: &map[string]string{},
  functionName: "testFunc",
- output: map[string]string{OFFunctionNameLabel: "testFunc"},
+ output: map[string]string{FunctionNameLabel: "testFunc"},
  },
  {
  name: "non-empty map does not overwrite the function name label",
- labels: &map[string]string{OFFunctionNameLabel: "anotherValue", "customLabel": "test"},
+ labels: &map[string]string{FunctionNameLabel: "anotherValue", "customLabel": "test"},
  functionName: "testFunc",
- output: map[string]string{OFFunctionNameLabel: "testFunc", "customLabel": "test"},
+ output: map[string]string{FunctionNameLabel: "testFunc", "customLabel": "test"},
  },
  }
 
@@ -74,7 +74,7 @@ func Test_parseLabels(t *testing.T) {
  t.Errorf("parseLabels should not return nil map")
  }
 
- outputFuncName := output[OFFunctionNameLabel]
+ outputFuncName := output[FunctionNameLabel]
  if outputFuncName != s.functionName {
  t.Errorf("parseLabels should always set the function name: expected %s, got %s", s.functionName, outputFuncName)
  }

handlers/reader.go

@@ -39,7 +39,7 @@ func getServiceList(functionNamespace string, clientset *kubernetes.Clientset) (
  functions := []requests.Function{}
 
  listOpts := metav1.ListOptions{
- LabelSelector: OFFunctionNameLabel,
+ LabelSelector: FunctionNameLabel,
  }
 
  res, err := clientset.ExtensionsV1beta1().Deployments(functionNamespace).List(listOpts)