Update label selector for instance index env injector

Also: * update labels/annotations for jobs (to be consistent with PR #17) * update the README Co-authored-by: Mario Nitchev <[email protected]>
cloudfoundry · Nov 18, 2021 · 309b9c2 · 309b9c2
1 parent a8f2d26
commit 309b9c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ so if you want to access your LRP you have to do it from within the cluster or
 use [telepresence](https://www.telepresence.io/).
 
 ```
-POD_IP=$(kubectl get pod -n cf-workloads --selector=cloudfoundry.org/source_type=APP -o jsonpath="{.items[0].status.podIP}")
+POD_IP=$(kubectl get pod -n cf-workloads --selector=workloads.cloudfoundry.org/source-type=APP -o jsonpath="{.items[0].status.podIP}")
 telepresence --run curl http://$POD_IP:8080/ 2>/dev/null
 ```
 
@@ -98,5 +98,5 @@ EOF
 In order to see the greeting message, run the following command
 
 ```
-kubectl logs -n cf-workloads --selector=cloudfoundry.org/source_type=TASK
+kubectl logs -n cf-workloads --selector=workloads.cloudfoundry.org/source-type=TASK
 ```
diff --git a/deployment/helm/templates/core/instance-index-env-injector-webhook.yml b/deployment/helm/templates/core/instance-index-env-injector-webhook.yml
@@ -7,7 +7,7 @@ webhooks:
 - name: instance-index-env-injector.eirini.cloudfoundry.org
  objectSelector:
  matchLabels:
- cloudfoundry.org/source_type: APP
+ workloads.cloudfoundry.org/source-type: APP
  rules:
  - apiGroups: [""]
  apiVersions: ["v1"]

diff --git a/k8s/jobs/package.go b/k8s/jobs/package.go
@@ -9,22 +9,22 @@ import (
 const (
  TaskSourceType = "TASK"
 
- AnnotationGUID = "cloudfoundry.org/guid"
+ AnnotationGUID = "workloads.cloudfoundry.org/guid"
  AnnotationAppName = stset.AnnotationAppName
  AnnotationAppID = stset.AnnotationAppID
  AnnotationOrgName = stset.AnnotationOrgName
  AnnotationOrgGUID = stset.AnnotationOrgGUID
  AnnotationSpaceName = stset.AnnotationSpaceName
  AnnotationSpaceGUID = stset.AnnotationSpaceGUID
- AnnotationTaskContainerName = "cloudfoundry.org/opi-task-container-name"
- AnnotationTaskCompletionReportCounter = "cloudfoundry.org/task_completion_report_counter"
- AnnotationCCAckedTaskCompletion = "cloudfoundry.org/cc_acked_task_completion"
+ AnnotationTaskContainerName = "workloads.cloudfoundry.org/opi-task-container-name"
+ AnnotationTaskCompletionReportCounter = "workloads.cloudfoundry.org/task_completion_report_counter"
+ AnnotationCCAckedTaskCompletion = "workloads.cloudfoundry.org/cc_acked_task_completion"
 
  LabelGUID = stset.LabelGUID
- LabelName = "cloudfoundry.org/name"
+ LabelName = "workloads.cloudfoundry.org/name"
  LabelAppGUID = stset.LabelAppGUID
  LabelSourceType = stset.LabelSourceType
- LabelTaskCompleted = "cloudfoundry.org/task_completed"
+ LabelTaskCompleted = "workloads.cloudfoundry.org/task_completed"
 
  TaskCompletedTrue = "true"
  PrivateRegistrySecretGenerateName = stset.PrivateRegistrySecretGenerateName