refactor: make the pod owner of the secret once created

jupyterhub · Dec 5, 2022 · 274e525 · 274e525
1 parent b5eef26
commit 274e525
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/binderhub/build.py b/binderhub/build.py
@@ -382,10 +382,17 @@ def submit(self):
 
         env = []
         if self.git_credentials:
-            secret = client.V1Secret()
-            secret.string_data = {"credentials": self.git_credentials}
-            secret.metadata = {"name": self.name}
-            secret.type = "Opaque"
+            secret = client.V1Secret(
+                metadata=client.V1ObjectMeta(
+                    name=self.name,
+                    labels={
+                        "name": self.name,
+                        "component": self._component_label,
+                    },
+                ),
+                string_data={"credentials": self.git_credentials},
+                type="Opaque",
+            )
 
             self.api.create_namespaced_secret(self.namespace, secret)
 
@@ -497,6 +504,24 @@ def submit(self):
                         # https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
                         phase = self.pod.status.phase
                         if phase == "Pending":
+                            if self.git_credentials:
+                                owner_reference = client.V1OwnerReference(
+                                    api_version="v1",
+                                    kind="Pod",
+                                    name=self.pod.metadata.name,
+                                    uid=self.pod.metadata.uid,
+                                )
+                                self.api.patch_namespaced_secret(
+                                    namespace=self.namespace,
+                                    name=self.pod.metadata.name,
+                                    body=[
+                                        {
+                                            "op": "replace",
+                                            "path": "/metadata/ownerReferences",
+                                            "value": [owner_reference],
+                                        }
+                                    ],
+                                )
                             self.progress(
                                 ProgressEvent.Kind.BUILD_STATUS_CHANGE,
                                 ProgressEvent.BuildStatus.PENDING,