Set CF_INSTANCE_INDEX env variable with downward API

cloudfoundry · Sep 18, 2024 · 67a76aa · 67a76aa
1 parent 6412fb3
commit 67a76aa
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 321 deletions.
diff --git a/controllers/main.go b/controllers/main.go
@@ -62,7 +62,6 @@ import (
 	jobtaskrunnercontrollers "code.cloudfoundry.org/korifi/job-task-runner/controllers"
 	"code.cloudfoundry.org/korifi/kpack-image-builder/controllers"
 	kpackimagebuilderfinalizer "code.cloudfoundry.org/korifi/kpack-image-builder/controllers/webhooks/finalizer"
-	statesetfulrunnerv1 "code.cloudfoundry.org/korifi/statefulset-runner/api/v1"
 	statefulsetcontrollers "code.cloudfoundry.org/korifi/statefulset-runner/controllers"
 	"code.cloudfoundry.org/korifi/tools"
 	"code.cloudfoundry.org/korifi/tools/image"
@@ -556,13 +555,6 @@ func main() {
 			os.Exit(1)
 		}
 
-		if controllerConfig.IncludeStatefulsetRunner {
-			if err = statesetfulrunnerv1.NewSTSPodDefaulter().SetupWebhookWithManager(mgr); err != nil {
-				setupLog.Error(err, "unable to create webhook", "webhook", "Pod")
-				os.Exit(1)
-			}
-		}
-
 		if controllerConfig.IncludeKpackImageBuilder {
 			kpackimagebuilderfinalizer.NewKpackImageBuilderFinalizerWebhook().SetupWebhookWithManager(mgr)
 		}

diff --git a/helm/korifi/statefulset-runner/manifests.yaml b/helm/korifi/statefulset-runner/manifests.yaml
diff --git a/statefulset-runner/Makefile b/statefulset-runner/Makefile
@@ -32,22 +32,12 @@ help: ## Display this help.
 export GOBIN = $(shell pwd)/bin
 export PATH := $(shell pwd)/bin:$(PATH)
 
-webhooks-file = ../helm/korifi/statefulset-runner/manifests.yaml
 .PHONY: manifests
 manifests: bin/controller-gen bin/yq
 	controller-gen \
 		paths="./..." \
 		rbac:roleName=korifi-statefulset-runner-appworkload-manager-role \
-		webhook \
-		output:rbac:artifacts:config=../helm/korifi/statefulset-runner \
-		output:webhook:artifacts:config=../helm/korifi/statefulset-runner
-
-	yq -i 'with(.metadata; .annotations["cert-manager.io/inject-ca-from"]="{{ .Release.Namespace }}/korifi-controllers-serving-cert")' $(webhooks-file)
-	yq -i 'with(.metadata; .name="korifi-statefulset-runner-" + .name)' $(webhooks-file)
-	yq -i 'with(.webhooks[]; .clientConfig.service.namespace="{{ .Release.Namespace }}")' $(webhooks-file)
-	yq -i 'with(.webhooks[]; .clientConfig.service.name="korifi-controllers-" + .clientConfig.service.name)' $(webhooks-file)
-	yq -i 'with(.webhooks[]; .objectSelector.matchLabels["korifi.cloudfoundry.org/add-stsr-index"]="true")' $(webhooks-file)
-
+		output:rbac:artifacts:config=../helm/korifi/statefulset-runner
 
 .PHONY: generate
 generate: bin/controller-gen

diff --git a/statefulset-runner/api/v1/pod_webhook.go b/statefulset-runner/api/v1/pod_webhook.go
diff --git a/statefulset-runner/api/v1/pod_webhook_test.go b/statefulset-runner/api/v1/pod_webhook_test.go
diff --git a/statefulset-runner/api/v1/webhook_suite_test.go b/statefulset-runner/api/v1/webhook_suite_test.go
diff --git a/statefulset-runner/api/v1alpha1/.gitkeep b/statefulset-runner/api/v1alpha1/.gitkeep
diff --git a/statefulset-runner/controllers/appworkload_controller.go b/statefulset-runner/controllers/appworkload_controller.go
@@ -49,12 +49,11 @@ const (
 	AnnotationAppID       = "korifi.cloudfoundry.org/application-id"
 	AnnotationProcessGUID = "korifi.cloudfoundry.org/process-guid"
 
-	LabelGUID                   = "korifi.cloudfoundry.org/guid"
-	LabelVersion                = "korifi.cloudfoundry.org/version"
-	LabelAppGUID                = "korifi.cloudfoundry.org/app-guid"
-	LabelAppWorkloadGUID        = "korifi.cloudfoundry.org/appworkload-guid"
-	LabelProcessType            = "korifi.cloudfoundry.org/process-type"
-	LabelStatefulSetRunnerIndex = "korifi.cloudfoundry.org/add-stsr-index"
+	LabelGUID            = "korifi.cloudfoundry.org/guid"
+	LabelVersion         = "korifi.cloudfoundry.org/version"
+	LabelAppGUID         = "korifi.cloudfoundry.org/app-guid"
+	LabelAppWorkloadGUID = "korifi.cloudfoundry.org/appworkload-guid"
+	LabelProcessType     = "korifi.cloudfoundry.org/process-type"
 
 	ApplicationContainerName  = "application"
 	AppWorkloadReconcilerName = "statefulset-runner"

diff --git a/statefulset-runner/controllers/appworkload_to_stset.go b/statefulset-runner/controllers/appworkload_to_stset.go
@@ -71,6 +71,14 @@ func (r *AppWorkloadToStatefulsetConverter) Convert(appWorkload *korifiv1alpha1.
 				},
 			},
 		},
+		{
+			Name: EnvCFInstanceIndex,
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					FieldPath: "metadata.labels['apps.kubernetes.io/pod-index']",
+				},
+			},
+		},
 		{
 			Name: EnvCFInstanceIP,
 			ValueFrom: &corev1.EnvVarSource{
@@ -178,12 +186,11 @@ func (r *AppWorkloadToStatefulsetConverter) Convert(appWorkload *korifiv1alpha1.
 	}
 
 	labels := map[string]string{
-		LabelGUID:                   appWorkload.Spec.GUID,
-		LabelProcessType:            appWorkload.Spec.ProcessType,
-		LabelVersion:                appWorkload.Spec.Version,
-		LabelAppGUID:                appWorkload.Spec.AppGUID,
-		LabelAppWorkloadGUID:        appWorkload.Name,
-		LabelStatefulSetRunnerIndex: "true",
+		LabelGUID:            appWorkload.Spec.GUID,
+		LabelProcessType:     appWorkload.Spec.ProcessType,
+		LabelVersion:         appWorkload.Spec.Version,
+		LabelAppGUID:         appWorkload.Spec.AppGUID,
+		LabelAppWorkloadGUID: appWorkload.Name,
 	}
 
 	statefulSet.Spec.Template.Labels = labels