Launch: Support multiple instances in the same namespace (#47)

wandb · Nov 22, 2023 · 54cc79b · 54cc79b
1 parent a07aac2
commit 54cc79b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/charts/launch-agent/Chart.yaml b/charts/launch-agent/Chart.yaml
@@ -3,7 +3,7 @@ name: launch-agent
 icon: https://em-content.zobj.net/thumbs/240/apple/354/rocket_1f680.png
 description: A Helm chart for running the W&B Launch Agent in Kubernetes
 type: application
-version: 0.11.5
+version: 0.11.6
 maintainers:
   - name: wandb
     email: support@wandb.com

diff --git a/charts/launch-agent/templates/configmap.yaml b/charts/launch-agent/templates/configmap.yaml
@@ -6,6 +6,6 @@ data:
     {{ required "Please set launchConfig to the contents of your agent config file" .Values.launchConfig | nindent 4 }}
 kind: ConfigMap
 metadata:
-  name: wandb-launch-configmap
+  name: wandb-launch-configmap-{{ .Release.Name }}
   namespace: {{ .Values.namespace }}
 ...
diff --git a/charts/launch-agent/templates/deployment.yaml b/charts/launch-agent/templates/deployment.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: launch-agent
+  name: launch-agent-{{ .Release.Name }}
   namespace: {{ .Values.namespace }}
   annotations:
     checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -12,16 +12,16 @@ spec:
     type: Recreate
   selector:
     matchLabels:
-      app: launch-agent
+      app: launch-agent-{{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: launch-agent
+        app: launch-agent-{{ .Release.Name }}
 {{- if .Values.agent.labels }}
 {{- toYaml .Values.agent.labels | trim | nindent 8 }}
 {{- end }}
     spec:
-      serviceAccountName: wandb-launch-serviceaccount
+      serviceAccountName: wandb-launch-serviceaccount-{{ .Release.Name }}
       containers:
         - name: launch-agent
           image: {{ .Values.agent.image }}
@@ -40,7 +40,7 @@ spec:
             - name: WANDB_API_KEY
               valueFrom:
                 secretKeyRef:
-                  name: wandb-api-key
+                  name: wandb-api-key-{{ .Release.Name }}
                   key: password
             - name: WANDB_LAUNCH_SERVICE_ACCOUNT_NAME
               valueFrom:
@@ -49,7 +49,7 @@ spec:
             - name: WANDB_BASE_URL
               valueFrom:
                 configMapKeyRef:
-                  name: wandb-launch-configmap
+                  name: wandb-launch-configmap-{{ .Release.Name }}
                   key: wandb-base-url
             - name: CM_CHECKSUM
               value: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -70,7 +70,7 @@ spec:
       volumes:
         - name: wandb-launch-config
           configMap:
-            name: wandb-launch-configmap
+            name: wandb-launch-configmap-{{ .Release.Name }}
         {{ if .Values.gitCreds}}
         - name: git-creds
           secret:

diff --git a/charts/launch-agent/templates/rbac.yaml b/charts/launch-agent/templates/rbac.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: wandb-launch-serviceaccount
+  name: wandb-launch-serviceaccount-{{ .Release.Name }}
   namespace: {{ .Values.namespace }}
 {{- if .Values.serviceAccount.annotations }}
   annotations:
@@ -13,7 +13,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   namespace: {{ .Values.namespace }}
-  name: wandb-launch-agent
+  name: wandb-launch-agent-{{ .Release.Name }}
 rules:
   - apiGroups: [""]
     resources: ["pods", "configmaps", "secrets", "pods/log"]
@@ -26,7 +26,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: job-creator-{{ .Release.Name }}
+  name: wandb-job-creator-{{ .Release.Name }}
 rules:
   - apiGroups: [""]
     resources: ["pods", "pods/log", "secrets"]
@@ -41,15 +41,15 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: wandb-launch-role-binding
+  name: wandb-launch-role-binding-{{ .Release.Name }}
   namespace: {{ .Values.namespace }}
 subjects:
   - kind: ServiceAccount
-    name: wandb-launch-serviceaccount
+    name: wandb-launch-serviceaccount-{{ .Release.Name }}
     namespace: {{ .Values.namespace }}
 roleRef:
   kind: Role
-  name: wandb-launch-agent
+  name: wandb-launch-agent-{{ .Release.Name }}
   apiGroup: rbac.authorization.k8s.io
 ...
 {{- define "unique.namespaces" }}
@@ -64,11 +64,11 @@ metadata:
   namespace: {{ $ns }}
 subjects:
   - kind: ServiceAccount
-    name: wandb-launch-serviceaccount
+    name: wandb-launch-serviceaccount-{{ $root.Release.Name }}
     namespace: {{ $root.Values.namespace }}
 roleRef:
   kind: ClusterRole
-  name: job-creator
+  name: wandb-job-creator-{{ $root.Release.Name }}
   apiGroup: rbac.authorization.k8s.io
 ...
 {{- end }}

diff --git a/charts/launch-agent/templates/secret.yaml b/charts/launch-agent/templates/secret.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: wandb-api-key
+  name: wandb-api-key-{{ .Release.Name }}
   namespace: {{ .Values.namespace }}
 type: kubernetes.io/basic-auth
 stringData: