diff --git a/PROJECT b/PROJECT index c65f8485..599bcddd 100644 --- a/PROJECT +++ b/PROJECT @@ -9,7 +9,7 @@ plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} projectName: slurm-operator -repo: github.com/SlinkyProject/slurm-operator +repo: github.com/togethercomputer/slurm-operator resources: - api: crdVersion: v1beta1 @@ -18,7 +18,7 @@ resources: domain: slurm.net group: slinky kind: Controller - path: github.com/SlinkyProject/slurm-operator/api/v1beta1 + path: github.com/togethercomputer/slurm-operator/api/v1beta1 version: v1beta1 webhooks: validation: true @@ -30,7 +30,7 @@ resources: domain: slurm.net group: slinky kind: RestApi - path: github.com/SlinkyProject/slurm-operator/api/v1beta1 + path: github.com/togethercomputer/slurm-operator/api/v1beta1 version: v1beta1 webhooks: validation: true @@ -42,7 +42,7 @@ resources: domain: slurm.net group: slinky kind: Accounting - path: github.com/SlinkyProject/slurm-operator/api/v1beta1 + path: github.com/togethercomputer/slurm-operator/api/v1beta1 version: v1beta1 webhooks: validation: true @@ -54,7 +54,7 @@ resources: domain: slurm.net group: slinky kind: NodeSet - path: github.com/SlinkyProject/slurm-operator/api/v1beta1 + path: github.com/togethercomputer/slurm-operator/api/v1beta1 version: v1beta1 webhooks: validation: true @@ -66,7 +66,7 @@ resources: domain: slurm.net group: slinky kind: LoginSet - path: github.com/SlinkyProject/slurm-operator/api/v1beta1 + path: github.com/togethercomputer/slurm-operator/api/v1beta1 version: v1beta1 webhooks: validation: true @@ -78,7 +78,7 @@ resources: domain: slurm.net group: slinky kind: Token - path: github.com/SlinkyProject/slurm-operator/api/v1beta1 + path: github.com/togethercomputer/slurm-operator/api/v1beta1 version: v1beta1 webhooks: validation: true @@ -90,6 +90,6 @@ resources: domain: slurm.net group: slinky kind: Controller - path: github.com/SlinkyProject/slurm-operator/api/v1beta1 + path: github.com/togethercomputer/slurm-operator/api/v1beta1 version: v1beta1 version: "3" diff --git a/README.md b/README.md index b074ace9..c7d935cb 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=for-the-badge)](./LICENSES/Apache-2.0.txt) -[![Tag](https://img.shields.io/github/v/tag/SlinkyProject/slurm-operator?style=for-the-badge)](https://github.com/SlinkyProject/slurm-operator/tags/) -[![Go-Version](https://img.shields.io/github/go-mod/go-version/SlinkyProject/slurm-operator?style=for-the-badge)](./go.mod) -[![Last-Commit](https://img.shields.io/github/last-commit/SlinkyProject/slurm-operator?style=for-the-badge)](https://github.com/SlinkyProject/slurm-operator/commits/) +[![Tag](https://img.shields.io/github/v/tag/togethercomputer/slurm-operator?style=for-the-badge)](https://github.com/togethercomputer/slurm-operator/tags/) +[![Go-Version](https://img.shields.io/github/go-mod/go-version/togethercomputer/slurm-operator?style=for-the-badge)](./go.mod) +[![Last-Commit](https://img.shields.io/github/last-commit/togethercomputer/slurm-operator?style=for-the-badge)](https://github.com/togethercomputer/slurm-operator/commits/)
diff --git a/api/v1beta1/accounting_keys.go b/api/v1beta1/accounting_keys.go index 43dcae60..647dc127 100644 --- a/api/v1beta1/accounting_keys.go +++ b/api/v1beta1/accounting_keys.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/SlinkyProject/slurm-operator/internal/utils/domainname" + "github.com/togethercomputer/slurm-operator/internal/utils/domainname" ) func (o *Accounting) Key() types.NamespacedName { diff --git a/api/v1beta1/controller_keys.go b/api/v1beta1/controller_keys.go index 392ba970..2cab255c 100644 --- a/api/v1beta1/controller_keys.go +++ b/api/v1beta1/controller_keys.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/SlinkyProject/slurm-operator/internal/utils/domainname" + "github.com/togethercomputer/slurm-operator/internal/utils/domainname" ) func (o *Controller) ClusterName() string { diff --git a/api/v1beta1/loginset_keys.go b/api/v1beta1/loginset_keys.go index 7ae564d5..3485204b 100644 --- a/api/v1beta1/loginset_keys.go +++ b/api/v1beta1/loginset_keys.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/SlinkyProject/slurm-operator/internal/utils/domainname" + "github.com/togethercomputer/slurm-operator/internal/utils/domainname" ) func (o *LoginSet) Key() types.NamespacedName { diff --git a/api/v1beta1/restapi_keys.go b/api/v1beta1/restapi_keys.go index 79373ba4..7a57bba0 100644 --- a/api/v1beta1/restapi_keys.go +++ b/api/v1beta1/restapi_keys.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/types" - "github.com/SlinkyProject/slurm-operator/internal/utils/domainname" + "github.com/togethercomputer/slurm-operator/internal/utils/domainname" ) func (o *RestApi) Key() types.NamespacedName { diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 5930a0ca..97f0bfd4 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -23,15 +23,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/controller/accounting" - "github.com/SlinkyProject/slurm-operator/internal/controller/controller" - "github.com/SlinkyProject/slurm-operator/internal/controller/loginset" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset" - "github.com/SlinkyProject/slurm-operator/internal/controller/restapi" - "github.com/SlinkyProject/slurm-operator/internal/controller/slurmclient" - "github.com/SlinkyProject/slurm-operator/internal/controller/token" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/controller/accounting" + "github.com/togethercomputer/slurm-operator/internal/controller/controller" + "github.com/togethercomputer/slurm-operator/internal/controller/loginset" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset" + "github.com/togethercomputer/slurm-operator/internal/controller/restapi" + "github.com/togethercomputer/slurm-operator/internal/controller/slurmclient" + "github.com/togethercomputer/slurm-operator/internal/controller/token" // +kubebuilder:scaffold:imports ) diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index dfaed2e3..417a356f 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - slinkywebhook "github.com/SlinkyProject/slurm-operator/internal/webhook" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + slinkywebhook "github.com/togethercomputer/slurm-operator/internal/webhook" // +kubebuilder:scaffold:imports ) diff --git a/docker-bake.hcl b/docker-bake.hcl index 016abb32..45978d73 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -22,15 +22,15 @@ target "_common" { labels = { # Ref: https://github.com/opencontainers/image-spec/blob/v1.0/annotations.md "org.opencontainers.image.authors" = "slinky@schedmd.com" - "org.opencontainers.image.documentation" = "https://github.com/SlinkyProject/slurm-operator" + "org.opencontainers.image.documentation" = "https://github.com/togethercomputer/slurm-operator" "org.opencontainers.image.license" = "Apache-2.0" "org.opencontainers.image.vendor" = "SchedMD LLC." "org.opencontainers.image.version" = "${VERSION}" - "org.opencontainers.image.source" = "https://github.com/SlinkyProject/slurm-operator" + "org.opencontainers.image.source" = "https://github.com/togethercomputer/slurm-operator" # Ref: https://docs.redhat.com/en/documentation/red_hat_software_certification/2025/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images "vendor" = "SchedMD LLC." "version" = "${VERSION}" - "release" = "https://github.com/SlinkyProject/slurm-operator" + "release" = "https://github.com/togethercomputer/slurm-operator" } } diff --git a/docs/index.rst b/docs/index.rst index ca81273b..352388ca 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -345,12 +345,12 @@ limitations under the License. .. |License| image:: https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=for-the-badge :target: ./LICENSES/Apache-2.0.txt -.. |Tag| image:: https://img.shields.io/github/v/tag/SlinkyProject/slurm-operator?style=for-the-badge - :target: https://github.com/SlinkyProject/slurm-operator/tags/ -.. |Go-Version| image:: https://img.shields.io/github/go-mod/go-version/SlinkyProject/slurm-operator?style=for-the-badge +.. |Tag| image:: https://img.shields.io/github/v/tag/togethercomputer/slurm-operator?style=for-the-badge + :target: https://github.com/togethercomputer/slurm-operator/tags/ +.. |Go-Version| image:: https://img.shields.io/github/go-mod/go-version/togethercomputer/slurm-operator?style=for-the-badge :target: ./go.mod -.. |Last-Commit| image:: https://img.shields.io/github/last-commit/SlinkyProject/slurm-operator?style=for-the-badge - :target: https://github.com/SlinkyProject/slurm-operator/commits/ +.. |Last-Commit| image:: https://img.shields.io/github/last-commit/togethercomputer/slurm-operator?style=for-the-badge + :target: https://github.com/togethercomputer/slurm-operator/commits/ .. toctree:: :maxdepth: 2 diff --git a/docs/versioning.md b/docs/versioning.md index ded3faec..3bcdb2d7 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -58,4 +58,4 @@ any kind (e.g., component flag changes). [semver]: https://semver.org/ [slurm-bridge]: https://github.com/SlinkyProject/slurm-bridge [slurm-client]: https://github.com/SlinkyProject/slurm-client -[slurm-operator]: https://github.com/SlinkyProject/slurm-operator +[slurm-operator]: https://github.com/togethercomputer/slurm-operator diff --git a/go.mod b/go.mod index 352d27cb..68539a2d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/SlinkyProject/slurm-operator +module github.com/togethercomputer/slurm-operator go 1.25.0 diff --git a/helm/slurm-operator-crds/Chart.yaml b/helm/slurm-operator-crds/Chart.yaml index e2ebc293..f15b9863 100644 --- a/helm/slurm-operator-crds/Chart.yaml +++ b/helm/slurm-operator-crds/Chart.yaml @@ -13,7 +13,7 @@ home: https://slinky.schedmd.com/ icon: https://github.com/SlinkyProject/docs/blob/main/docs/_static/images/slinky.svg sources: - - https://github.com/SlinkyProject/slurm-operator + - https://github.com/togethercomputer/slurm-operator maintainers: - name: SchedMD LLC. diff --git a/helm/slurm-operator-crds/README.md b/helm/slurm-operator-crds/README.md index 2041f67a..ea9625f1 100644 --- a/helm/slurm-operator-crds/README.md +++ b/helm/slurm-operator-crds/README.md @@ -14,5 +14,5 @@ Slurm Operator CRDs ## Source Code -* +* diff --git a/helm/slurm-operator/Chart.yaml b/helm/slurm-operator/Chart.yaml index 8a270134..4710de2f 100644 --- a/helm/slurm-operator/Chart.yaml +++ b/helm/slurm-operator/Chart.yaml @@ -15,7 +15,7 @@ home: https://slinky.schedmd.com/ icon: https://github.com/SlinkyProject/docs/blob/main/docs/_static/images/slinky.svg sources: - - https://github.com/SlinkyProject/slurm-operator + - https://github.com/togethercomputer/slurm-operator maintainers: - name: SchedMD LLC. diff --git a/helm/slurm-operator/README.md b/helm/slurm-operator/README.md index 4a61fa81..f522ff2f 100644 --- a/helm/slurm-operator/README.md +++ b/helm/slurm-operator/README.md @@ -14,7 +14,7 @@ Slurm Operator ## Source Code -* +* ## Requirements diff --git a/helm/slurm-operator/templates/operator/rbac.yaml b/helm/slurm-operator/templates/operator/rbac.yaml index 87f84dda..1206298e 100644 --- a/helm/slurm-operator/templates/operator/rbac.yaml +++ b/helm/slurm-operator/templates/operator/rbac.yaml @@ -45,6 +45,7 @@ rules: - list - watch - patch + - update - apiGroups: - "" resources: diff --git a/helm/slurm/Chart.yaml b/helm/slurm/Chart.yaml index b59061af..cb1cc151 100644 --- a/helm/slurm/Chart.yaml +++ b/helm/slurm/Chart.yaml @@ -17,7 +17,7 @@ icon: https://github.com/SlinkyProject/docs/blob/main/docs/_static/images/slurm- sources: - https://github.com/SchedMD/slurm - https://github.com/SlinkyProject/containers - - https://github.com/SlinkyProject/slurm-operator + - https://github.com/togethercomputer/slurm-operator maintainers: - name: SchedMD LLC. diff --git a/helm/slurm/README.md b/helm/slurm/README.md index c10fe3ce..3dbdb6ce 100644 --- a/helm/slurm/README.md +++ b/helm/slurm/README.md @@ -16,7 +16,7 @@ Slurm Cluster * * -* +* ## Requirements diff --git a/helm/slurm/templates/_slurm.tpl b/helm/slurm/templates/_slurm.tpl index f93df720..2a3c9fc1 100644 --- a/helm/slurm/templates/_slurm.tpl +++ b/helm/slurm/templates/_slurm.tpl @@ -30,3 +30,27 @@ Define auth/jwt HS256 secret ref key {{- define "slurm.authJwtHs256Ref.key" -}} {{- print "jwt_hs256.key" -}} {{- end }} + +{{/* +Define login name +*/}} +{{- define "slurm.login.name" -}} +{{- printf "%s-login" (include "slurm.fullname" .) -}} +{{- end }} + +{{/* +Define login labels +*/}} +{{- define "slurm.login.labels" -}} +app.kubernetes.io/component: login +{{ include "slurm.login.selectorLabels" . }} +{{ include "slurm.labels" . }} +{{- end }} + +{{/* +Define login selectorLabels +*/}} +{{- define "slurm.login.selectorLabels" -}} +app.kubernetes.io/name: login +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/helm/slurm/templates/login/login-deployment.yaml b/helm/slurm/templates/login/login-deployment.yaml new file mode 100644 index 00000000..69fdaab0 --- /dev/null +++ b/helm/slurm/templates/login/login-deployment.yaml @@ -0,0 +1,138 @@ +{{- /* +SPDX-FileCopyrightText: Copyright (C) SchedMD LLC. +SPDX-License-Identifier: Apache-2.0 +*/}} + +{{- if .Values.login.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "slurm.login.name" . }} + namespace: {{ include "slurm.namespace" . }} + labels: + {{- include "slurm.login.labels" . | nindent 4 }} +spec: + replicas: {{ .Values.login.replicas }} + selector: + matchLabels: + {{- include "slurm.login.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + {{- include "slurm.login.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.login.priorityClassName }} + priorityClassName: {{ . }} + {{- end }} + {{- with .Values.login.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.login.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.login.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: login + image: "{{ .Values.login.image.repository }}:{{ .Values.login.image.tag }}" + imagePullPolicy: {{ .Values.login.imagePullPolicy | default .Values.imagePullPolicy }} + {{- with .Values.login.securityContext }} + securityContext: + {{- toYaml . | nindent 10 }} + {{- end }} + {{- with .Values.login.resources }} + resources: + {{- toYaml . | nindent 10 }} + {{- end }} + env: + - name: SLURM_CLUSTER_NAME + value: {{ include "slurm.fullname" . }} + - name: SLURM_CONF_SERVER + value: {{ include "slurm.fullname" . }}.{{ include "slurm.namespace" . }}.svc.cluster.local + volumeMounts: + - name: slurm-config + mountPath: /etc/slurm + {{- if .Values.login.sharedMemorySize }} + - name: dshm + mountPath: /dev/shm + {{- end }} + {{- range .Values.login.extraVolumeMounts }} + - name: {{ .name }} + mountPath: {{ .mountPath }} + {{- if .subPath }} + subPath: {{ .subPath }} + {{- end }} + {{- if .readOnly }} + readOnly: {{ .readOnly }} + {{- end }} + {{- end }} + command: ["/bin/bash", "-c"] + args: + - | + set -e + echo "Starting login node..." + # Wait for slurm.conf to be available + while [ ! -f /etc/slurm/slurm.conf ]; do + echo "Waiting for slurm.conf..." + sleep 5 + done + # Start munge + service munge start + # Start SSH service if needed + if command -v sshd &> /dev/null; then + service ssh start || service sshd start || true + fi + # Keep container running + tail -f /dev/null + volumes: + - name: slurm-config + configMap: + name: {{ include "slurm.fullname" . }}-config + {{- if .Values.login.sharedMemorySize }} + - name: dshm + emptyDir: + medium: Memory + sizeLimit: {{ .Values.login.sharedMemorySize }} + {{- end }} + {{- range .Values.login.extraVolumes }} + - name: {{ .name }} + {{- if .configMap }} + configMap: + name: {{ .configMap.name }} + {{- with .configMap.items }} + items: + {{- toYaml . | nindent 10 }} + {{- end }} + {{- else if .secret }} + secret: + secretName: {{ .secret.secretName }} + {{- with .secret.items }} + items: + {{- toYaml . | nindent 10 }} + {{- end }} + {{- else if .persistentVolumeClaim }} + persistentVolumeClaim: + claimName: {{ .persistentVolumeClaim.claimName }} + {{- else if .nfs }} + nfs: + server: {{ .nfs.server }} + path: {{ .nfs.path }} + {{- else if .emptyDir }} + emptyDir: {} + {{- else if .hostPath }} + hostPath: + path: {{ .hostPath.path }} + {{- if .hostPath.type }} + type: {{ .hostPath.type }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/helm/slurm/templates/login/login-service.yaml b/helm/slurm/templates/login/login-service.yaml new file mode 100644 index 00000000..2f9ad63a --- /dev/null +++ b/helm/slurm/templates/login/login-service.yaml @@ -0,0 +1,23 @@ +{{- /* +SPDX-FileCopyrightText: Copyright (C) SchedMD LLC. +SPDX-License-Identifier: Apache-2.0 +*/}} + +{{- if .Values.login.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "slurm.login.name" . }} + namespace: {{ include "slurm.namespace" . }} + labels: + {{- include "slurm.login.labels" . | nindent 4 }} +spec: + type: ClusterIP + selector: + {{- include "slurm.login.selectorLabels" . | nindent 4 }} + ports: + - name: ssh + port: 22 + targetPort: 22 + protocol: TCP +{{- end }} \ No newline at end of file diff --git a/helm/slurm/templates/nodeset/nodeset-cr.yaml b/helm/slurm/templates/nodeset/nodeset-cr.yaml index 22842b8e..e39ae797 100644 --- a/helm/slurm/templates/nodeset/nodeset-cr.yaml +++ b/helm/slurm/templates/nodeset/nodeset-cr.yaml @@ -13,6 +13,30 @@ SPDX-License-Identifier: Apache-2.0 {{- $priorityClassName := $podSpec.priorityClassName | default $.Values.priorityClassName -}} {{- $_ := set $podSpec "priorityClassName" $priorityClassName -}} {{- $_ := set $podSpec "hostname" (printf "%s-" $key) -}} +{{- /* Add shared memory volume and mount if shmSize is specified (Together addition) */}} +{{- if $podSpec.shmSize }} + {{- $volumes := $podSpec.volumes | default list -}} + {{- $shmVolume := dict "name" "dshm" "emptyDir" (dict "medium" "Memory" "sizeLimit" $podSpec.shmSize) -}} + {{- $volumes = append $volumes $shmVolume -}} + {{- $_ := set $podSpec "volumes" $volumes -}} + {{- $volumeMounts := $nodeset.slurmd.volumeMounts | default list -}} + {{- $shmVolumeMount := dict "name" "dshm" "mountPath" "/dev/shm" -}} + {{- $volumeMounts = append $volumeMounts $shmVolumeMount -}} + {{- $_ := set $nodeset.slurmd "volumeMounts" $volumeMounts -}} +{{- end }} +{{- /* Add existing data claim volumes and mounts (Together addition) */}} +{{- if and $nodeset.persistence $nodeset.persistence.existingDataClaims }} + {{- $volumes := $podSpec.volumes | default list -}} + {{- $volumeMounts := $nodeset.slurmd.volumeMounts | default list -}} + {{- range $nodeset.persistence.existingDataClaims }} + {{- $pvcVolume := dict "name" .name "persistentVolumeClaim" (dict "claimName" .name) -}} + {{- $volumes = append $volumes $pvcVolume -}} + {{- $pvcVolumeMount := dict "name" .name "mountPath" .mountPath -}} + {{- $volumeMounts = append $volumeMounts $pvcVolumeMount -}} + {{- end }} + {{- $_ := set $podSpec "volumes" $volumes -}} + {{- $_ := set $nodeset.slurmd "volumeMounts" $volumeMounts -}} +{{- end }} {{- $podTemplate := dict "metadata" $podMetadata "spec" $podSpec -}} {{- if $nodeset.useResourceLimits }} {{- $envLimts := list (dict "name" "POD_CPUS" "value" (include "slurm.worker.podCpus" $nodeset.slurmd | toString)) (dict "name" "POD_MEMORY" "value" (include "slurm.worker.podMemory" $nodeset.slurmd | toString)) -}} diff --git a/helm/slurm/values.yaml b/helm/slurm/values.yaml index b27a1605..57e7eebc 100644 --- a/helm/slurm/values.yaml +++ b/helm/slurm/values.yaml @@ -556,6 +556,8 @@ loginsets: # - key: key1 # operator: Exists # effect: NoSchedule + # -- (string) Set the size of the shared memory for the nodeset. + shmSize: 16Gi # -- List of volumes to use. # Ref: https://kubernetes.io/docs/concepts/storage/volumes/ volumes: [] @@ -576,6 +578,14 @@ loginsets: type: LoadBalancer # port: 22 # nodePort: 32222 + # -- Persistence configuration for the nodeset. + persistence: + # -- (list) Existing PersistentVolumeClaims to mount (Together addition) + existingDataClaims: [] + # - name: data-cpu-pv + # mountPath: /data + # - name: scratch-gpu-pv + # mountPath: /scratch # Slurm NodeSet (slurmd) configurations. nodesets: @@ -685,6 +695,8 @@ nodesets: tolerations: [] # - key: nvidia.com/gpu # effect: NoSchedule + # -- (string) Set the size of the shared memory for the nodeset. + shmSize: 16Gi # -- List of volumes to use. # Ref: https://kubernetes.io/docs/concepts/storage/volumes/ volumes: [] @@ -694,6 +706,14 @@ nodesets: # path: /exports/home # -- Taint the Kubernetes nodes on which nodeset pods are scheduled with NoExecute taintKubeNodes: false + # -- Persistence configuration for the nodeset. + persistence: + # -- (list) Existing PersistentVolumeClaims to mount (Together addition) + existingDataClaims: [] + # - name: data-cpu-pv + # mountPath: /data + # - name: scratch-gpu-pv + # mountPath: /scratch # Slurm partition configurations. partitions: @@ -729,3 +749,93 @@ vendor: jobMappingDir: "/var/lib/dcgm-exporter/job-mapping" # -- Script execution priority (lower numbers run first) scriptPriority: "90" + +login: + # + # -- (bool) + # Enables login nodes. + enabled: true + # + # -- (integer) + # Set the number of replicas to deploy. + replicas: 1 + # + # -- (string) + # Set the image pull policy. + imagePullPolicy: IfNotPresent + # + # Set the image to use. + image: + # + # -- (string) + # Set the image repository to use. + repository: ghcr.io/slinkyproject/login + # + # -- (string) + # Set the image tag to use. + tag: 25.05-ubuntu24.04 + # + # -- (object) + # The security context given to the container. + # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + securityContext: + privileged: false + # capabilities: + # add: + # - SYS_CHROOT + # + # --(list) + # List of volume mounts. + # Ref: https://kubernetes.io/docs/concepts/storage/volumes/ + extraVolumeMounts: [] + # - name: nfs-home + # mountPath: /home + # - name: nfs-data + # mountPath: /mnt/data + # + # --(list) + # Define list of pod volumes. + # Ref: https://kubernetes.io/docs/concepts/storage/volumes/ + extraVolumes: [] + # - name: nfs-home + # nfs: + # server: nfs-server.example.com + # path: /exports/home/ + # - name: nfs-data + # persistentVolumeClaim: + # claimName: nfs-data + # + # -- (string) + # Set the priority class to use. + # Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass + priorityClassName: "" + # + # -- (map) + # Selector which must match a node's labels for the pod to be scheduled on that node. + # Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector + nodeSelector: + kubernetes.io/os: linux + # + # -- (object) + # Set affinity for Kubernetes Pod scheduling. + # Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity + affinity: {} + # + # -- (list) + # Configure pod tolerations. + # Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ + tolerations: [] + # + # -- (object) + # Set container resource requests and limits for Kubernetes Pod scheduling. + # Ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-requests-and-limits-of-pod-and-container + resources: {} + # requests: + # cpu: 1 + # memory: 1Gi + # limits: + # cpu: 2 + # memory: 4Gi + +# +# Slurm compute (slurmd) configurations. diff --git a/internal/annotations/node.go b/internal/annotations/node.go new file mode 100644 index 00000000..3493ebab --- /dev/null +++ b/internal/annotations/node.go @@ -0,0 +1,14 @@ +// SPDX-FileCopyrightText: Copyright (C) SchedMD LLC. +// SPDX-License-Identifier: Apache-2.0 + +package annotations + +const ( + // NodeWeight can be used to set to an int32 that represents the weight of + // scheduling a NodeSet Pod compared to other Nodes. + // Note that this is honored on a best-effort basis, and so it does not + // offer guarantees on Node scheduling order. + NodeWeight = "slinky.slurm.net/node-weight" + // NodeCordon is used to mark a node as cordoned for Together's use case + NodeCordon = "slinky.slurm.net/node-cordon" +) \ No newline at end of file diff --git a/internal/builder/accounting_app.go b/internal/builder/accounting_app.go index d7bec44f..9646db67 100644 --- a/internal/builder/accounting_app.go +++ b/internal/builder/accounting_app.go @@ -16,11 +16,11 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" - "github.com/SlinkyProject/slurm-operator/internal/utils/crypto" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" + "github.com/togethercomputer/slurm-operator/internal/utils/crypto" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) const ( diff --git a/internal/builder/accounting_app_test.go b/internal/builder/accounting_app_test.go index 590278a7..4c47754b 100644 --- a/internal/builder/accounting_app_test.go +++ b/internal/builder/accounting_app_test.go @@ -7,8 +7,8 @@ import ( _ "embed" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" "k8s.io/utils/set" diff --git a/internal/builder/accounting_config.go b/internal/builder/accounting_config.go index 8356bca9..0d7ad229 100644 --- a/internal/builder/accounting_config.go +++ b/internal/builder/accounting_config.go @@ -8,10 +8,10 @@ import ( corev1 "k8s.io/api/core/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/config" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/config" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func (b *Builder) BuildAccountingConfig(accounting *slinkyv1beta1.Accounting) (*corev1.Secret, error) { diff --git a/internal/builder/accounting_config_test.go b/internal/builder/accounting_config_test.go index d1cda62a..f0229801 100644 --- a/internal/builder/accounting_config_test.go +++ b/internal/builder/accounting_config_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/builder/accounting_service.go b/internal/builder/accounting_service.go index a2d0e81f..6533e987 100644 --- a/internal/builder/accounting_service.go +++ b/internal/builder/accounting_service.go @@ -7,9 +7,9 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func (b *Builder) BuildAccountingService(accounting *slinkyv1beta1.Accounting) (*corev1.Service, error) { diff --git a/internal/builder/accounting_service_test.go b/internal/builder/accounting_service_test.go index 95b4d507..9f1ad8d0 100644 --- a/internal/builder/accounting_service_test.go +++ b/internal/builder/accounting_service_test.go @@ -6,7 +6,7 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/set" diff --git a/internal/builder/builder.go b/internal/builder/builder.go index c1db52f1..e759d9b2 100644 --- a/internal/builder/builder.go +++ b/internal/builder/builder.go @@ -4,7 +4,7 @@ package builder import ( - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/builder/builder_test.go b/internal/builder/builder_test.go index 9d65f6fe..5621ce0e 100644 --- a/internal/builder/builder_test.go +++ b/internal/builder/builder_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/builder/common.go b/internal/builder/common.go index 15e69ac0..11d8b0c1 100644 --- a/internal/builder/common.go +++ b/internal/builder/common.go @@ -12,10 +12,10 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/domainname" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/domainname" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) const ( diff --git a/internal/builder/configmap.go b/internal/builder/configmap.go index e6f67525..c05e7eee 100644 --- a/internal/builder/configmap.go +++ b/internal/builder/configmap.go @@ -12,8 +12,8 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" ) type ConfigMapOpts struct { diff --git a/internal/builder/configmap_test.go b/internal/builder/configmap_test.go index 7bf0b9fb..8b43babd 100644 --- a/internal/builder/configmap_test.go +++ b/internal/builder/configmap_test.go @@ -6,8 +6,8 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" appsv1 "k8s.io/api/apps/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/builder/container.go b/internal/builder/container.go index 52f41d94..6d9d7985 100644 --- a/internal/builder/container.go +++ b/internal/builder/container.go @@ -6,8 +6,8 @@ package builder import ( corev1 "k8s.io/api/core/v1" - "github.com/SlinkyProject/slurm-operator/internal/utils/reflectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + "github.com/togethercomputer/slurm-operator/internal/utils/reflectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) type ContainerOpts struct { diff --git a/internal/builder/controller_app.go b/internal/builder/controller_app.go index 394657cc..00db65ec 100644 --- a/internal/builder/controller_app.go +++ b/internal/builder/controller_app.go @@ -15,9 +15,9 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" ) const ( diff --git a/internal/builder/controller_app_test.go b/internal/builder/controller_app_test.go index 46e740e6..898e2b3f 100644 --- a/internal/builder/controller_app_test.go +++ b/internal/builder/controller_app_test.go @@ -7,8 +7,8 @@ import ( _ "embed" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" "k8s.io/utils/set" diff --git a/internal/builder/controller_config.go b/internal/builder/controller_config.go index 8b7e64c0..7f7bc0b8 100644 --- a/internal/builder/controller_config.go +++ b/internal/builder/controller_config.go @@ -15,10 +15,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/config" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/config" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) const ( diff --git a/internal/builder/controller_config_test.go b/internal/builder/controller_config_test.go index 7e85fb22..244159bb 100644 --- a/internal/builder/controller_config_test.go +++ b/internal/builder/controller_config_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/builder/controller_service.go b/internal/builder/controller_service.go index 517f3f54..a880aef4 100644 --- a/internal/builder/controller_service.go +++ b/internal/builder/controller_service.go @@ -7,9 +7,9 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func (b *Builder) BuildControllerService(controller *slinkyv1beta1.Controller) (*corev1.Service, error) { diff --git a/internal/builder/controller_service_test.go b/internal/builder/controller_service_test.go index c580e410..d09bcc02 100644 --- a/internal/builder/controller_service_test.go +++ b/internal/builder/controller_service_test.go @@ -6,7 +6,7 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/set" diff --git a/internal/builder/controller_servicemonitor.go b/internal/builder/controller_servicemonitor.go index 89a3550d..517d25e3 100644 --- a/internal/builder/controller_servicemonitor.go +++ b/internal/builder/controller_servicemonitor.go @@ -7,9 +7,9 @@ import ( monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/reflectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/reflectutils" ) func (b *Builder) BuildControllerServiceMonitor(controller *slinkyv1beta1.Controller) (*monitoringv1.ServiceMonitor, error) { diff --git a/internal/builder/controller_servicemonitor_test.go b/internal/builder/controller_servicemonitor_test.go index 829f1be4..91944ca4 100644 --- a/internal/builder/controller_servicemonitor_test.go +++ b/internal/builder/controller_servicemonitor_test.go @@ -6,9 +6,9 @@ package builder_test import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" "k8s.io/utils/set" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/internal/builder/labels/labels.go b/internal/builder/labels/labels.go index 6a3ed333..8aface67 100644 --- a/internal/builder/labels/labels.go +++ b/internal/builder/labels/labels.go @@ -6,7 +6,7 @@ package labels import ( "maps" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // Ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/#labels diff --git a/internal/builder/labels/labels_test.go b/internal/builder/labels/labels_test.go index 7e6efebb..79012a60 100644 --- a/internal/builder/labels/labels_test.go +++ b/internal/builder/labels/labels_test.go @@ -6,7 +6,7 @@ package labels import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" "k8s.io/apimachinery/pkg/api/equality" ) diff --git a/internal/builder/login_app.go b/internal/builder/login_app.go index 8ed4f2a4..206d7d27 100644 --- a/internal/builder/login_app.go +++ b/internal/builder/login_app.go @@ -17,10 +17,10 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" - "github.com/SlinkyProject/slurm-operator/internal/utils/crypto" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" + "github.com/togethercomputer/slurm-operator/internal/utils/crypto" ) const ( diff --git a/internal/builder/login_app_test.go b/internal/builder/login_app_test.go index 35aba34c..cfb058c6 100644 --- a/internal/builder/login_app_test.go +++ b/internal/builder/login_app_test.go @@ -7,8 +7,8 @@ import ( _ "embed" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/set" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/builder/login_config.go b/internal/builder/login_config.go index dda993f3..f4f790a5 100644 --- a/internal/builder/login_config.go +++ b/internal/builder/login_config.go @@ -6,10 +6,10 @@ package builder import ( corev1 "k8s.io/api/core/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/config" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/config" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func (b *Builder) BuildLoginSshConfig(loginset *slinkyv1beta1.LoginSet) (*corev1.ConfigMap, error) { diff --git a/internal/builder/login_config_test.go b/internal/builder/login_config_test.go index 7d50aad5..b3e7954c 100644 --- a/internal/builder/login_config_test.go +++ b/internal/builder/login_config_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/internal/builder/login_secret.go b/internal/builder/login_secret.go index 3df02f9e..79464bca 100644 --- a/internal/builder/login_secret.go +++ b/internal/builder/login_secret.go @@ -8,10 +8,10 @@ import ( corev1 "k8s.io/api/core/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/crypto" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/crypto" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func (b *Builder) BuildLoginSshHostKeys(loginset *slinkyv1beta1.LoginSet) (*corev1.Secret, error) { diff --git a/internal/builder/login_secret_test.go b/internal/builder/login_secret_test.go index a10c499d..31cdfad4 100644 --- a/internal/builder/login_secret_test.go +++ b/internal/builder/login_secret_test.go @@ -6,7 +6,7 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/internal/builder/login_service.go b/internal/builder/login_service.go index d17293aa..65414253 100644 --- a/internal/builder/login_service.go +++ b/internal/builder/login_service.go @@ -7,9 +7,9 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func (b *Builder) BuildLoginService(loginset *slinkyv1beta1.LoginSet) (*corev1.Service, error) { diff --git a/internal/builder/login_service_test.go b/internal/builder/login_service_test.go index 1012c944..b95d83c9 100644 --- a/internal/builder/login_service_test.go +++ b/internal/builder/login_service_test.go @@ -6,7 +6,7 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/set" diff --git a/internal/builder/metadata/metadata.go b/internal/builder/metadata/metadata.go index df074608..f17a3c9c 100644 --- a/internal/builder/metadata/metadata.go +++ b/internal/builder/metadata/metadata.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) type MetadataBuilder struct { diff --git a/internal/builder/metadata/metadata_test.go b/internal/builder/metadata/metadata_test.go index 9b9ff7bf..47296050 100644 --- a/internal/builder/metadata/metadata_test.go +++ b/internal/builder/metadata/metadata_test.go @@ -6,7 +6,7 @@ package metadata import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/internal/builder/pod_disruption_budget.go b/internal/builder/pod_disruption_budget.go index a30e8504..3b554634 100644 --- a/internal/builder/pod_disruption_budget.go +++ b/internal/builder/pod_disruption_budget.go @@ -11,8 +11,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" ) type PodDisruptionBudgetOpts struct { diff --git a/internal/builder/pod_template.go b/internal/builder/pod_template.go index 9a6c51f9..43c2f3d4 100644 --- a/internal/builder/pod_template.go +++ b/internal/builder/pod_template.go @@ -7,10 +7,10 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" - "github.com/SlinkyProject/slurm-operator/internal/utils/reflectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" + "github.com/togethercomputer/slurm-operator/internal/utils/reflectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) type PodTemplateOpts struct { diff --git a/internal/builder/restapi_app.go b/internal/builder/restapi_app.go index 7eb5c49d..f928318d 100644 --- a/internal/builder/restapi_app.go +++ b/internal/builder/restapi_app.go @@ -17,9 +17,9 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" ) const ( diff --git a/internal/builder/restapi_app_test.go b/internal/builder/restapi_app_test.go index fce2d284..3a21b0dd 100644 --- a/internal/builder/restapi_app_test.go +++ b/internal/builder/restapi_app_test.go @@ -7,8 +7,8 @@ import ( _ "embed" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" "k8s.io/utils/set" diff --git a/internal/builder/restapi_service.go b/internal/builder/restapi_service.go index 0f6dfa82..005b5fa6 100644 --- a/internal/builder/restapi_service.go +++ b/internal/builder/restapi_service.go @@ -7,9 +7,9 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func (b *Builder) BuildRestapiService(restapi *slinkyv1beta1.RestApi) (*corev1.Service, error) { diff --git a/internal/builder/restapi_service_test.go b/internal/builder/restapi_service_test.go index fe6a675b..be16c3c3 100644 --- a/internal/builder/restapi_service_test.go +++ b/internal/builder/restapi_service_test.go @@ -6,7 +6,7 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/set" diff --git a/internal/builder/secret.go b/internal/builder/secret.go index f39bb52f..836703a8 100644 --- a/internal/builder/secret.go +++ b/internal/builder/secret.go @@ -12,8 +12,8 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" ) type SecretOpts struct { diff --git a/internal/builder/secret_test.go b/internal/builder/secret_test.go index 60dc3ff7..b85d6d1b 100644 --- a/internal/builder/secret_test.go +++ b/internal/builder/secret_test.go @@ -6,8 +6,8 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" appsv1 "k8s.io/api/apps/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/builder/service.go b/internal/builder/service.go index 5f6a250f..131245fb 100644 --- a/internal/builder/service.go +++ b/internal/builder/service.go @@ -11,9 +11,9 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) type ServiceOpts struct { diff --git a/internal/builder/service_test.go b/internal/builder/service_test.go index c45de713..063b8200 100644 --- a/internal/builder/service_test.go +++ b/internal/builder/service_test.go @@ -6,8 +6,8 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/internal/builder/servicemonitor.go b/internal/builder/servicemonitor.go index 395765ed..178d255b 100644 --- a/internal/builder/servicemonitor.go +++ b/internal/builder/servicemonitor.go @@ -11,10 +11,10 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" - "github.com/SlinkyProject/slurm-operator/internal/utils/reflectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" + "github.com/togethercomputer/slurm-operator/internal/utils/reflectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) type ServiceMonitorOpts struct { diff --git a/internal/builder/servicemonitor_test.go b/internal/builder/servicemonitor_test.go index 1c953633..38b743e6 100644 --- a/internal/builder/servicemonitor_test.go +++ b/internal/builder/servicemonitor_test.go @@ -6,7 +6,7 @@ package builder_test import ( "testing" - "github.com/SlinkyProject/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/builder" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/internal/builder/token_secret.go b/internal/builder/token_secret.go index 689d9f03..e701eccf 100644 --- a/internal/builder/token_secret.go +++ b/internal/builder/token_secret.go @@ -9,8 +9,8 @@ import ( corev1 "k8s.io/api/core/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/controller/token/slurmjwt" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/controller/token/slurmjwt" ) func (b *Builder) BuildTokenSecret(token *slinkyv1beta1.Token) (*corev1.Secret, error) { diff --git a/internal/builder/token_secret_test.go b/internal/builder/token_secret_test.go index 7b70b3e2..2dcafe17 100644 --- a/internal/builder/token_secret_test.go +++ b/internal/builder/token_secret_test.go @@ -7,7 +7,7 @@ import ( _ "embed" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/internal/builder/worker_app.go b/internal/builder/worker_app.go index c3e7c81e..e3457db7 100644 --- a/internal/builder/worker_app.go +++ b/internal/builder/worker_app.go @@ -15,10 +15,10 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/builder/metadata" - slurmtaints "github.com/SlinkyProject/slurm-operator/pkg/taints" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/builder/metadata" + slurmtaints "github.com/togethercomputer/slurm-operator/pkg/taints" ) const ( diff --git a/internal/builder/worker_app_test.go b/internal/builder/worker_app_test.go index 03e58dcc..4b334012 100644 --- a/internal/builder/worker_app_test.go +++ b/internal/builder/worker_app_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8slabels "k8s.io/apimachinery/pkg/labels" diff --git a/internal/builder/worker_pdb.go b/internal/builder/worker_pdb.go index 44b6c3db..90349f91 100644 --- a/internal/builder/worker_pdb.go +++ b/internal/builder/worker_pdb.go @@ -13,8 +13,8 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" ) // BuildClusterWorkerPodDisruptionBudget creates a single PodDisruptionBudget for ALL worker NodeSets in the same Slurm cluster diff --git a/internal/builder/worker_service.go b/internal/builder/worker_service.go index 4b98bea2..3619e410 100644 --- a/internal/builder/worker_service.go +++ b/internal/builder/worker_service.go @@ -11,8 +11,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" ) // BuildClusterWorkerService creates a single headless service for ALL worker NodeSets in the same Slurm cluster diff --git a/internal/builder/worker_service_test.go b/internal/builder/worker_service_test.go index 286b52fe..75681215 100644 --- a/internal/builder/worker_service_test.go +++ b/internal/builder/worker_service_test.go @@ -6,7 +6,7 @@ package builder import ( "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/controller/accounting/accounting_controller.go b/internal/controller/accounting/accounting_controller.go index 5ea036a0..69fc035e 100644 --- a/internal/controller/accounting/accounting_controller.go +++ b/internal/controller/accounting/accounting_controller.go @@ -21,11 +21,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/controller/accounting/eventhandler" - "github.com/SlinkyProject/slurm-operator/internal/utils/durationstore" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/controller/accounting/eventhandler" + "github.com/togethercomputer/slurm-operator/internal/utils/durationstore" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) const ( diff --git a/internal/controller/accounting/accounting_controller_test.go b/internal/controller/accounting/accounting_controller_test.go index a3e89166..b277dd71 100644 --- a/internal/controller/accounting/accounting_controller_test.go +++ b/internal/controller/accounting/accounting_controller_test.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) var _ = Describe("Accounting controller", func() { diff --git a/internal/controller/accounting/accounting_sync.go b/internal/controller/accounting/accounting_sync.go index f5d0e6cb..a05db1f5 100644 --- a/internal/controller/accounting/accounting_sync.go +++ b/internal/controller/accounting/accounting_sync.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) type SyncStep struct { diff --git a/internal/controller/accounting/accounting_sync_status.go b/internal/controller/accounting/accounting_sync_status.go index 1d80b708..cab8980e 100644 --- a/internal/controller/accounting/accounting_sync_status.go +++ b/internal/controller/accounting/accounting_sync_status.go @@ -15,7 +15,7 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // syncStatus handles determining and updating the status. diff --git a/internal/controller/accounting/eventhandler/eventhandler_accounting.go b/internal/controller/accounting/eventhandler/eventhandler_accounting.go index dfb4e339..25fb5f9d 100644 --- a/internal/controller/accounting/eventhandler/eventhandler_accounting.go +++ b/internal/controller/accounting/eventhandler/eventhandler_accounting.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewAccountingEventHandler(reader client.Reader) *AccountingEventHandler { diff --git a/internal/controller/accounting/eventhandler/eventhandler_accounting_test.go b/internal/controller/accounting/eventhandler/eventhandler_accounting_test.go index b42b8ae0..9a8e5fa7 100644 --- a/internal/controller/accounting/eventhandler/eventhandler_accounting_test.go +++ b/internal/controller/accounting/eventhandler/eventhandler_accounting_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/controller/accounting/eventhandler/eventhandler_secret.go b/internal/controller/accounting/eventhandler/eventhandler_secret.go index 75c20d93..4077b585 100644 --- a/internal/controller/accounting/eventhandler/eventhandler_secret.go +++ b/internal/controller/accounting/eventhandler/eventhandler_secret.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) func NewSecretEventHandler(reader client.Reader) *SecretEventHandler { diff --git a/internal/controller/accounting/eventhandler/eventhandler_secret_test.go b/internal/controller/accounting/eventhandler/eventhandler_secret_test.go index cec83fd9..995d62ff 100644 --- a/internal/controller/accounting/eventhandler/eventhandler_secret_test.go +++ b/internal/controller/accounting/eventhandler/eventhandler_secret_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func Test_SecretEventHandler_Create(t *testing.T) { diff --git a/internal/controller/accounting/eventhandler/utils_test.go b/internal/controller/accounting/eventhandler/utils_test.go index 1b5dba26..c9ee6eb2 100644 --- a/internal/controller/accounting/eventhandler/utils_test.go +++ b/internal/controller/accounting/eventhandler/utils_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func init() { diff --git a/internal/controller/accounting/suite_test.go b/internal/controller/accounting/suite_test.go index 824de6fc..97f50bb6 100644 --- a/internal/controller/accounting/suite_test.go +++ b/internal/controller/accounting/suite_test.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/controller/controller_controller.go b/internal/controller/controller/controller_controller.go index 0997e89e..7d0ab217 100644 --- a/internal/controller/controller/controller_controller.go +++ b/internal/controller/controller/controller_controller.go @@ -21,12 +21,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/controller/controller/eventhandler" - "github.com/SlinkyProject/slurm-operator/internal/utils/durationstore" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/controller/controller/eventhandler" + "github.com/togethercomputer/slurm-operator/internal/utils/durationstore" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) const ( diff --git a/internal/controller/controller/controller_controller_test.go b/internal/controller/controller/controller_controller_test.go index e7216993..17f09270 100644 --- a/internal/controller/controller/controller_controller_test.go +++ b/internal/controller/controller/controller_controller_test.go @@ -11,8 +11,8 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) var _ = Describe("Slurm Controller", func() { diff --git a/internal/controller/controller/controller_sync.go b/internal/controller/controller/controller_sync.go index 7a9392d1..a8077ccf 100644 --- a/internal/controller/controller/controller_sync.go +++ b/internal/controller/controller/controller_sync.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) type SyncStep struct { diff --git a/internal/controller/controller/controller_sync_status.go b/internal/controller/controller/controller_sync_status.go index 18c5ce6a..bd80ce2f 100644 --- a/internal/controller/controller/controller_sync_status.go +++ b/internal/controller/controller/controller_sync_status.go @@ -15,7 +15,7 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // syncStatus handles determining and updating the status. diff --git a/internal/controller/controller/eventhandler/eventhandler_accounting.go b/internal/controller/controller/eventhandler/eventhandler_accounting.go index 981ce581..8f50cc11 100644 --- a/internal/controller/controller/eventhandler/eventhandler_accounting.go +++ b/internal/controller/controller/eventhandler/eventhandler_accounting.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewAccountingEventHandler(reader client.Reader) *AccountingEventHandler { diff --git a/internal/controller/controller/eventhandler/eventhandler_accounting_test.go b/internal/controller/controller/eventhandler/eventhandler_accounting_test.go index b42b8ae0..9a8e5fa7 100644 --- a/internal/controller/controller/eventhandler/eventhandler_accounting_test.go +++ b/internal/controller/controller/eventhandler/eventhandler_accounting_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/controller/controller/eventhandler/eventhandler_nodeset.go b/internal/controller/controller/eventhandler/eventhandler_nodeset.go index 18ff02a8..6458e6ea 100644 --- a/internal/controller/controller/eventhandler/eventhandler_nodeset.go +++ b/internal/controller/controller/eventhandler/eventhandler_nodeset.go @@ -12,9 +12,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewNodeSetEventHandler(reader client.Reader) *NodesetEventHandler { diff --git a/internal/controller/controller/eventhandler/eventhandler_nodeset_test.go b/internal/controller/controller/eventhandler/eventhandler_nodeset_test.go index ac3fe2ce..908c1fa7 100644 --- a/internal/controller/controller/eventhandler/eventhandler_nodeset_test.go +++ b/internal/controller/controller/eventhandler/eventhandler_nodeset_test.go @@ -15,8 +15,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func Test_NodeSetEventHandler_Create(t *testing.T) { diff --git a/internal/controller/controller/eventhandler/eventhandler_secret.go b/internal/controller/controller/eventhandler/eventhandler_secret.go index 015d5487..0fa6bce5 100644 --- a/internal/controller/controller/eventhandler/eventhandler_secret.go +++ b/internal/controller/controller/eventhandler/eventhandler_secret.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) func NewSecretEventHandler(reader client.Reader) *SecretEventHandler { diff --git a/internal/controller/controller/eventhandler/eventhandler_secret_test.go b/internal/controller/controller/eventhandler/eventhandler_secret_test.go index 5bc2ec30..6baf56a1 100644 --- a/internal/controller/controller/eventhandler/eventhandler_secret_test.go +++ b/internal/controller/controller/eventhandler/eventhandler_secret_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func Test_SecretEventHandler_Create(t *testing.T) { diff --git a/internal/controller/controller/eventhandler/utils_test.go b/internal/controller/controller/eventhandler/utils_test.go index 1b5dba26..c9ee6eb2 100644 --- a/internal/controller/controller/eventhandler/utils_test.go +++ b/internal/controller/controller/eventhandler/utils_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func init() { diff --git a/internal/controller/controller/suite_test.go b/internal/controller/controller/suite_test.go index 3f93086e..20224e25 100644 --- a/internal/controller/controller/suite_test.go +++ b/internal/controller/controller/suite_test.go @@ -21,9 +21,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/loginset/eventhandler/eventhandler_loginset.go b/internal/controller/loginset/eventhandler/eventhandler_loginset.go index 5e0bbb9b..109abed8 100644 --- a/internal/controller/loginset/eventhandler/eventhandler_loginset.go +++ b/internal/controller/loginset/eventhandler/eventhandler_loginset.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewControllerEventHandler(reader client.Reader) *ControllerEventHandler { diff --git a/internal/controller/loginset/eventhandler/eventhandler_loginset_test.go b/internal/controller/loginset/eventhandler/eventhandler_loginset_test.go index 9ef03e7a..fdb57d63 100644 --- a/internal/controller/loginset/eventhandler/eventhandler_loginset_test.go +++ b/internal/controller/loginset/eventhandler/eventhandler_loginset_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/controller/loginset/eventhandler/eventhandler_secret.go b/internal/controller/loginset/eventhandler/eventhandler_secret.go index b6149cfe..68b929af 100644 --- a/internal/controller/loginset/eventhandler/eventhandler_secret.go +++ b/internal/controller/loginset/eventhandler/eventhandler_secret.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewSecretEventHandler(reader client.Reader) *SecretEventHandler { diff --git a/internal/controller/loginset/eventhandler/eventhandler_secret_test.go b/internal/controller/loginset/eventhandler/eventhandler_secret_test.go index 7ae79023..075c3249 100644 --- a/internal/controller/loginset/eventhandler/eventhandler_secret_test.go +++ b/internal/controller/loginset/eventhandler/eventhandler_secret_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func Test_SecretEventHandler_Create(t *testing.T) { diff --git a/internal/controller/loginset/eventhandler/utils_test.go b/internal/controller/loginset/eventhandler/utils_test.go index 1b5dba26..c9ee6eb2 100644 --- a/internal/controller/loginset/eventhandler/utils_test.go +++ b/internal/controller/loginset/eventhandler/utils_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func init() { diff --git a/internal/controller/loginset/loginset_controller.go b/internal/controller/loginset/loginset_controller.go index 7155806f..114db4d5 100644 --- a/internal/controller/loginset/loginset_controller.go +++ b/internal/controller/loginset/loginset_controller.go @@ -21,11 +21,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/controller/loginset/eventhandler" - "github.com/SlinkyProject/slurm-operator/internal/utils/durationstore" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/controller/loginset/eventhandler" + "github.com/togethercomputer/slurm-operator/internal/utils/durationstore" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) const ( diff --git a/internal/controller/loginset/loginset_controller_test.go b/internal/controller/loginset/loginset_controller_test.go index ac4abebf..a08962df 100644 --- a/internal/controller/loginset/loginset_controller_test.go +++ b/internal/controller/loginset/loginset_controller_test.go @@ -11,8 +11,8 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) var _ = Describe("LoginSet Controller", func() { diff --git a/internal/controller/loginset/loginset_sync.go b/internal/controller/loginset/loginset_sync.go index 67efcf8e..fdc6906d 100644 --- a/internal/controller/loginset/loginset_sync.go +++ b/internal/controller/loginset/loginset_sync.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) type SyncStep struct { diff --git a/internal/controller/loginset/loginset_sync_status.go b/internal/controller/loginset/loginset_sync_status.go index 55a3a6a9..59c8bf81 100644 --- a/internal/controller/loginset/loginset_sync_status.go +++ b/internal/controller/loginset/loginset_sync_status.go @@ -17,8 +17,8 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" ) // syncStatus handles determining and updating the status. diff --git a/internal/controller/loginset/suite_test.go b/internal/controller/loginset/suite_test.go index d93ccf6a..746a186e 100644 --- a/internal/controller/loginset/suite_test.go +++ b/internal/controller/loginset/suite_test.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/nodeset/eventhandler/eventhandler_controller.go b/internal/controller/nodeset/eventhandler/eventhandler_controller.go index 1ba9e6b7..f226d094 100644 --- a/internal/controller/nodeset/eventhandler/eventhandler_controller.go +++ b/internal/controller/nodeset/eventhandler/eventhandler_controller.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewControllerEventHandler(reader client.Reader) *ControllerEventHandler { diff --git a/internal/controller/nodeset/eventhandler/eventhandler_controller_test.go b/internal/controller/nodeset/eventhandler/eventhandler_controller_test.go index d3b6346a..6f7eb47c 100644 --- a/internal/controller/nodeset/eventhandler/eventhandler_controller_test.go +++ b/internal/controller/nodeset/eventhandler/eventhandler_controller_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func Test_ControllerEventHandler_Create(t *testing.T) { diff --git a/internal/controller/nodeset/eventhandler/eventhandler_node.go b/internal/controller/nodeset/eventhandler/eventhandler_node.go index e34e105a..65018ffb 100644 --- a/internal/controller/nodeset/eventhandler/eventhandler_node.go +++ b/internal/controller/nodeset/eventhandler/eventhandler_node.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) func NewNodeEventHandler(reader client.Reader) *NodeEventHandler { diff --git a/internal/controller/nodeset/eventhandler/eventhandler_node_test.go b/internal/controller/nodeset/eventhandler/eventhandler_node_test.go index 2d15cd9f..8f2d6d13 100644 --- a/internal/controller/nodeset/eventhandler/eventhandler_node_test.go +++ b/internal/controller/nodeset/eventhandler/eventhandler_node_test.go @@ -15,9 +15,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/indexes" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/indexes" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" ) func Test_NodeEventHandler_Create(t *testing.T) { diff --git a/internal/controller/nodeset/eventhandler/eventhandler_pod.go b/internal/controller/nodeset/eventhandler/eventhandler_pod.go index 51686607..a4cbeaae 100644 --- a/internal/controller/nodeset/eventhandler/eventhandler_pod.go +++ b/internal/controller/nodeset/eventhandler/eventhandler_pod.go @@ -30,11 +30,11 @@ import ( slurmclient "github.com/SlinkyProject/slurm-client/pkg/client" slurmtypes "github.com/SlinkyProject/slurm-client/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podinfo" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/podinfo" ) func NewPodEventHandler(reader client.Reader, expectations *kubecontroller.UIDTrackingControllerExpectations) *PodEventHandler { diff --git a/internal/controller/nodeset/eventhandler/eventhandler_secret.go b/internal/controller/nodeset/eventhandler/eventhandler_secret.go index 2b234020..5ea832d4 100644 --- a/internal/controller/nodeset/eventhandler/eventhandler_secret.go +++ b/internal/controller/nodeset/eventhandler/eventhandler_secret.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewSecretEventHandler(reader client.Reader) *SecretEventHandler { diff --git a/internal/controller/nodeset/eventhandler/eventhandler_secret_test.go b/internal/controller/nodeset/eventhandler/eventhandler_secret_test.go index 616d93da..7cd72bfa 100644 --- a/internal/controller/nodeset/eventhandler/eventhandler_secret_test.go +++ b/internal/controller/nodeset/eventhandler/eventhandler_secret_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func Test_SecretEventHandler_Create(t *testing.T) { diff --git a/internal/controller/nodeset/eventhandler/utils_test.go b/internal/controller/nodeset/eventhandler/utils_test.go index 456125f4..9d7e2992 100644 --- a/internal/controller/nodeset/eventhandler/utils_test.go +++ b/internal/controller/nodeset/eventhandler/utils_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func init() { diff --git a/internal/controller/nodeset/nodeset_controller.go b/internal/controller/nodeset/nodeset_controller.go index 3d63b3b8..8ef2edfc 100644 --- a/internal/controller/nodeset/nodeset_controller.go +++ b/internal/controller/nodeset/nodeset_controller.go @@ -23,16 +23,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/eventhandler" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/indexes" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/podcontrol" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/slurmcontrol" - "github.com/SlinkyProject/slurm-operator/internal/utils/durationstore" - "github.com/SlinkyProject/slurm-operator/internal/utils/historycontrol" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/eventhandler" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/indexes" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/podcontrol" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/slurmcontrol" + "github.com/togethercomputer/slurm-operator/internal/utils/durationstore" + "github.com/togethercomputer/slurm-operator/internal/utils/historycontrol" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) const ( diff --git a/internal/controller/nodeset/nodeset_controller_test.go b/internal/controller/nodeset/nodeset_controller_test.go index 3a2bdcc1..f1ba25d7 100644 --- a/internal/controller/nodeset/nodeset_controller_test.go +++ b/internal/controller/nodeset/nodeset_controller_test.go @@ -22,9 +22,9 @@ import ( "github.com/SlinkyProject/slurm-client/pkg/object" slurmtypes "github.com/SlinkyProject/slurm-client/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func newFakeClientList(interceptorFuncs interceptor.Funcs, initObjLists ...object.ObjectList) slurmclient.Client { diff --git a/internal/controller/nodeset/nodeset_history.go b/internal/controller/nodeset/nodeset_history.go index b354de8f..ad261ddc 100644 --- a/internal/controller/nodeset/nodeset_history.go +++ b/internal/controller/nodeset/nodeset_history.go @@ -14,8 +14,8 @@ import ( "k8s.io/kubernetes/pkg/controller/history" "k8s.io/utils/ptr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/historycontrol" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/historycontrol" ) // truncateHistory truncates any non-live ControllerRevisions in revisions from nodeset's history. The UpdateRevision and diff --git a/internal/controller/nodeset/nodeset_history_test.go b/internal/controller/nodeset/nodeset_history_test.go index 9bbd8709..1008dc17 100644 --- a/internal/controller/nodeset/nodeset_history_test.go +++ b/internal/controller/nodeset/nodeset_history_test.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func TestNodeSetReconciler_truncateHistory(t *testing.T) { diff --git a/internal/controller/nodeset/nodeset_sync.go b/internal/controller/nodeset/nodeset_sync.go index 39a209ae..132b3c41 100644 --- a/internal/controller/nodeset/nodeset_sync.go +++ b/internal/controller/nodeset/nodeset_sync.go @@ -26,17 +26,18 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/historycontrol" - "github.com/SlinkyProject/slurm-operator/internal/utils/mathutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podcontrol" - "github.com/SlinkyProject/slurm-operator/internal/utils/podutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" - slurmtaints "github.com/SlinkyProject/slurm-operator/pkg/taints" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/annotations" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/historycontrol" + "github.com/togethercomputer/slurm-operator/internal/utils/mathutils" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/podcontrol" + "github.com/togethercomputer/slurm-operator/internal/utils/podutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" + slurmtaints "github.com/togethercomputer/slurm-operator/pkg/taints" ) const ( @@ -671,13 +672,22 @@ func (r *NodeSetReconciler) doPodScaleIn( return err } } - if isDrained, err := r.slurmControl.IsNodeDrained(ctx, nodeset, pod); !isDrained || err != nil { + isDrained, err := r.slurmControl.IsNodeDrained(ctx, nodeset, pod) + if err != nil { + r.expectations.DeletionObserved(logger, key, podKey) + return err + } + + // Update K8s node annotation to reflect drain state + if err := r.updateNodeCordonAnnotation(ctx, nodeset, pod, isDrained); err != nil { + logger.Error(err, "Failed to update node cordon annotation", "pod", klog.KObj(pod)) + // Don't fail the reconciliation, just log the error + } + + if !isDrained { // Decrement expectations and requeue reconcile because the Slurm node is not drained yet. // We must wait until fully drained to terminate the pod. r.expectations.DeletionObserved(logger, key, podKey) - if err != nil { - return err - } } return nil }) @@ -721,6 +731,12 @@ func (r *NodeSetReconciler) processCondemned( return err } + // Update K8s node annotation to reflect drain state + if err := r.updateNodeCordonAnnotation(ctx, nodeset, pod, isDrained); err != nil { + logger.Error(err, "Failed to update node cordon annotation", "pod", klog.KObj(pod)) + // Don't fail the reconciliation, just log the error + } + if podutils.IsRunning(pod) && !isDrained { logger.V(2).Info("NodeSet Pod is draining, pending termination for scale-in", "pod", klog.KObj(pod)) @@ -885,6 +901,8 @@ func (r *NodeSetReconciler) makePodUncordonAndUndrain( pod *corev1.Pod, reason string, ) error { + logger := log.FromContext(ctx) + if err := r.makePodUncordon(ctx, pod); err != nil { return err } @@ -893,6 +911,12 @@ func (r *NodeSetReconciler) makePodUncordonAndUndrain( return err } + // Update K8s node annotation to reflect undrained state + if err := r.updateNodeCordonAnnotation(ctx, nodeset, pod, false); err != nil { + logger.Error(err, "Failed to update node cordon annotation", "pod", klog.KObj(pod)) + // Don't fail the reconciliation, just log the error + } + return nil } @@ -1119,3 +1143,58 @@ func (r *NodeSetReconciler) syncClusterWorkerPDB( return nil } + +// updateNodeCordonAnnotation updates the K8s node annotation to reflect cordon state based on Slurm drain status +func (r *NodeSetReconciler) updateNodeCordonAnnotation( + ctx context.Context, + nodeset *slinkyv1beta1.NodeSet, + pod *corev1.Pod, + isDrained bool, +) error { + logger := klog.FromContext(ctx) + + // Get the K8s node that the pod is running on + if pod.Spec.NodeName == "" { + // Pod not scheduled yet, nothing to do + return nil + } + + node := &corev1.Node{} + nodeKey := types.NamespacedName{Name: pod.Spec.NodeName} + if err := r.Get(ctx, nodeKey, node); err != nil { + if apierrors.IsNotFound(err) { + // Node doesn't exist, nothing to do + return nil + } + return err + } + + // Initialize annotations if nil + if node.Annotations == nil { + node.Annotations = make(map[string]string) + } + + // Check current annotation value + currentValue := node.Annotations[annotations.NodeCordon] + expectedValue := fmt.Sprintf("%t", isDrained) + + // Only update if the value has changed + if currentValue != expectedValue { + node.Annotations[annotations.NodeCordon] = expectedValue + + if isDrained { + logger.Info("Node is drained, marking as cordoned", + "node", node.Name, "pod", klog.KObj(pod)) + } else { + logger.Info("Node is not drained, marking as uncordoned", + "node", node.Name, "pod", klog.KObj(pod)) + } + + // Update the node + if err := r.Update(ctx, node); err != nil { + return fmt.Errorf("failed to update node %s cordon annotation: %w", node.Name, err) + } + } + + return nil +} diff --git a/internal/controller/nodeset/nodeset_sync_status.go b/internal/controller/nodeset/nodeset_sync_status.go index bd290090..25bf71d6 100644 --- a/internal/controller/nodeset/nodeset_sync_status.go +++ b/internal/controller/nodeset/nodeset_sync_status.go @@ -22,16 +22,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/slurmcontrol" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/historycontrol" - "github.com/SlinkyProject/slurm-operator/internal/utils/mathutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" - slurmconditions "github.com/SlinkyProject/slurm-operator/pkg/conditions" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/slurmcontrol" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/historycontrol" + "github.com/togethercomputer/slurm-operator/internal/utils/mathutils" + "github.com/togethercomputer/slurm-operator/internal/utils/podutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" + slurmconditions "github.com/togethercomputer/slurm-operator/pkg/conditions" ) // syncStatus handles synchronizing Slurm Nodes and NodeSet Status. diff --git a/internal/controller/nodeset/nodeset_sync_status_test.go b/internal/controller/nodeset/nodeset_sync_status_test.go index 1e5db4e8..cf1e6e7d 100644 --- a/internal/controller/nodeset/nodeset_sync_status_test.go +++ b/internal/controller/nodeset/nodeset_sync_status_test.go @@ -21,12 +21,12 @@ import ( slurminterceptor "github.com/SlinkyProject/slurm-client/pkg/client/interceptor" slurmtypes "github.com/SlinkyProject/slurm-client/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/slurmcontrol" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" - slurmconditions "github.com/SlinkyProject/slurm-operator/pkg/conditions" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/slurmcontrol" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" + slurmconditions "github.com/togethercomputer/slurm-operator/pkg/conditions" ) func TestNodeSetReconciler_syncStatus(t *testing.T) { diff --git a/internal/controller/nodeset/nodeset_sync_test.go b/internal/controller/nodeset/nodeset_sync_test.go index 20dd9a36..aa7d9877 100644 --- a/internal/controller/nodeset/nodeset_sync_test.go +++ b/internal/controller/nodeset/nodeset_sync_test.go @@ -38,17 +38,17 @@ import ( slurmobject "github.com/SlinkyProject/slurm-client/pkg/object" slurmtypes "github.com/SlinkyProject/slurm-client/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/podcontrol" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/slurmcontrol" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/historycontrol" - "github.com/SlinkyProject/slurm-operator/internal/utils/podutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" - slurmtaints "github.com/SlinkyProject/slurm-operator/pkg/taints" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/podcontrol" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/slurmcontrol" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/historycontrol" + "github.com/togethercomputer/slurm-operator/internal/utils/podutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" + slurmtaints "github.com/togethercomputer/slurm-operator/pkg/taints" ) func newNodeSetController(client client.Client, clientMap *clientmap.ClientMap) *NodeSetReconciler { diff --git a/internal/controller/nodeset/podcontrol/podcontrol.go b/internal/controller/nodeset/podcontrol/podcontrol.go index c73694f5..6880e25b 100644 --- a/internal/controller/nodeset/podcontrol/podcontrol.go +++ b/internal/controller/nodeset/podcontrol/podcontrol.go @@ -23,10 +23,10 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podcontrol" - "github.com/SlinkyProject/slurm-operator/internal/utils/podutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/podcontrol" + "github.com/togethercomputer/slurm-operator/internal/utils/podutils" ) const ( diff --git a/internal/controller/nodeset/podcontrol/podcontrol_test.go b/internal/controller/nodeset/podcontrol/podcontrol_test.go index c1d10321..51347d18 100644 --- a/internal/controller/nodeset/podcontrol/podcontrol_test.go +++ b/internal/controller/nodeset/podcontrol/podcontrol_test.go @@ -26,9 +26,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/client/interceptor" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podcontrol" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/podcontrol" ) func newPodControl(client client.Client, recorder record.EventRecorder) *realPodControl { diff --git a/internal/controller/nodeset/slurmcontrol/slurmcontrol.go b/internal/controller/nodeset/slurmcontrol/slurmcontrol.go index 5c520be1..261cc3c2 100644 --- a/internal/controller/nodeset/slurmcontrol/slurmcontrol.go +++ b/internal/controller/nodeset/slurmcontrol/slurmcontrol.go @@ -23,12 +23,12 @@ import ( slurmobject "github.com/SlinkyProject/slurm-client/pkg/object" slurmtypes "github.com/SlinkyProject/slurm-client/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podinfo" - "github.com/SlinkyProject/slurm-operator/internal/utils/timestore" - slurmconditions "github.com/SlinkyProject/slurm-operator/pkg/conditions" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/podinfo" + "github.com/togethercomputer/slurm-operator/internal/utils/timestore" + slurmconditions "github.com/togethercomputer/slurm-operator/pkg/conditions" ) type SlurmControlInterface interface { diff --git a/internal/controller/nodeset/slurmcontrol/slurmcontrol_test.go b/internal/controller/nodeset/slurmcontrol/slurmcontrol_test.go index 696b98d8..c8502e8b 100644 --- a/internal/controller/nodeset/slurmcontrol/slurmcontrol_test.go +++ b/internal/controller/nodeset/slurmcontrol/slurmcontrol_test.go @@ -27,11 +27,11 @@ import ( "github.com/SlinkyProject/slurm-client/pkg/object" "github.com/SlinkyProject/slurm-client/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - nodesetutils "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/utils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podinfo" - slurmconditions "github.com/SlinkyProject/slurm-operator/pkg/conditions" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + nodesetutils "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/utils" + "github.com/togethercomputer/slurm-operator/internal/utils/podinfo" + slurmconditions "github.com/togethercomputer/slurm-operator/pkg/conditions" ) func newNodeSet(name, controllerName string, replicas int32) *slinkyv1beta1.NodeSet { diff --git a/internal/controller/nodeset/slurmcontrol/suite_test.go b/internal/controller/nodeset/slurmcontrol/suite_test.go index 9e1e7155..e689a593 100644 --- a/internal/controller/nodeset/slurmcontrol/suite_test.go +++ b/internal/controller/nodeset/slurmcontrol/suite_test.go @@ -18,8 +18,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/nodeset/suite_test.go b/internal/controller/nodeset/suite_test.go index effe202d..e99d0c2b 100644 --- a/internal/controller/nodeset/suite_test.go +++ b/internal/controller/nodeset/suite_test.go @@ -22,9 +22,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/nodeset/utils/sort.go b/internal/controller/nodeset/utils/sort.go index 8bf0d0e6..237437cc 100644 --- a/internal/controller/nodeset/utils/sort.go +++ b/internal/controller/nodeset/utils/sort.go @@ -12,10 +12,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/mathutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/podutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/mathutils" + "github.com/togethercomputer/slurm-operator/internal/utils/podutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) // ActivePods type allows custom sorting of pods so a controller can pick the best ones to delete. diff --git a/internal/controller/nodeset/utils/sort_test.go b/internal/controller/nodeset/utils/sort_test.go index aa3f5ec7..68bc7b25 100644 --- a/internal/controller/nodeset/utils/sort_test.go +++ b/internal/controller/nodeset/utils/sort_test.go @@ -15,7 +15,7 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func TestSortingActivePods(t *testing.T) { diff --git a/internal/controller/nodeset/utils/utils.go b/internal/controller/nodeset/utils/utils.go index 8973a48a..2debb965 100644 --- a/internal/controller/nodeset/utils/utils.go +++ b/internal/controller/nodeset/utils/utils.go @@ -17,10 +17,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" - "github.com/SlinkyProject/slurm-operator/internal/utils/historycontrol" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" + "github.com/togethercomputer/slurm-operator/internal/utils/historycontrol" ) // refResolver := refresolver.New(b.client) diff --git a/internal/controller/nodeset/utils/utils_test.go b/internal/controller/nodeset/utils/utils_test.go index 9fd3de3c..76ea17c7 100644 --- a/internal/controller/nodeset/utils/utils_test.go +++ b/internal/controller/nodeset/utils/utils_test.go @@ -14,8 +14,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder/labels" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder/labels" ) func newNodeSet(name string) *slinkyv1beta1.NodeSet { diff --git a/internal/controller/restapi/eventhandler/eventhandler_controller.go b/internal/controller/restapi/eventhandler/eventhandler_controller.go index 64dafbb4..9afb79e5 100644 --- a/internal/controller/restapi/eventhandler/eventhandler_controller.go +++ b/internal/controller/restapi/eventhandler/eventhandler_controller.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewControllerEventHandler(reader client.Reader) *ControllerEventHandler { diff --git a/internal/controller/restapi/eventhandler/eventhandler_controller_test.go b/internal/controller/restapi/eventhandler/eventhandler_controller_test.go index 9ef03e7a..fdb57d63 100644 --- a/internal/controller/restapi/eventhandler/eventhandler_controller_test.go +++ b/internal/controller/restapi/eventhandler/eventhandler_controller_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/controller/restapi/eventhandler/eventhandler_secret.go b/internal/controller/restapi/eventhandler/eventhandler_secret.go index cada4780..d9163704 100644 --- a/internal/controller/restapi/eventhandler/eventhandler_secret.go +++ b/internal/controller/restapi/eventhandler/eventhandler_secret.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) func NewSecretEventHandler(reader client.Reader) *SecretEventHandler { diff --git a/internal/controller/restapi/eventhandler/eventhandler_secret_test.go b/internal/controller/restapi/eventhandler/eventhandler_secret_test.go index f0aa6149..b1ce5c2a 100644 --- a/internal/controller/restapi/eventhandler/eventhandler_secret_test.go +++ b/internal/controller/restapi/eventhandler/eventhandler_secret_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) func Test_SecretEventHandler_Create(t *testing.T) { diff --git a/internal/controller/restapi/eventhandler/utils_test.go b/internal/controller/restapi/eventhandler/utils_test.go index 1b5dba26..c9ee6eb2 100644 --- a/internal/controller/restapi/eventhandler/utils_test.go +++ b/internal/controller/restapi/eventhandler/utils_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func init() { diff --git a/internal/controller/restapi/restapi_controller.go b/internal/controller/restapi/restapi_controller.go index 26f1f1d7..b3eeb4cd 100644 --- a/internal/controller/restapi/restapi_controller.go +++ b/internal/controller/restapi/restapi_controller.go @@ -21,11 +21,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/controller/restapi/eventhandler" - "github.com/SlinkyProject/slurm-operator/internal/utils/durationstore" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/controller/restapi/eventhandler" + "github.com/togethercomputer/slurm-operator/internal/utils/durationstore" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) const ( diff --git a/internal/controller/restapi/restapi_controller_test.go b/internal/controller/restapi/restapi_controller_test.go index 4d4f7b45..85c2ce74 100644 --- a/internal/controller/restapi/restapi_controller_test.go +++ b/internal/controller/restapi/restapi_controller_test.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - testutils "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + testutils "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) var _ = Describe("RestApi Controller", func() { diff --git a/internal/controller/restapi/restapi_sync.go b/internal/controller/restapi/restapi_sync.go index 33063c8c..ca2faf25 100644 --- a/internal/controller/restapi/restapi_sync.go +++ b/internal/controller/restapi/restapi_sync.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) type SyncStep struct { diff --git a/internal/controller/restapi/restapi_sync_status.go b/internal/controller/restapi/restapi_sync_status.go index c667facd..f161c8a2 100644 --- a/internal/controller/restapi/restapi_sync_status.go +++ b/internal/controller/restapi/restapi_sync_status.go @@ -15,7 +15,7 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // syncStatus handles determining and updating the status. diff --git a/internal/controller/restapi/suite_test.go b/internal/controller/restapi/suite_test.go index d101e2b3..6aad47a9 100644 --- a/internal/controller/restapi/suite_test.go +++ b/internal/controller/restapi/suite_test.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - testutils "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + testutils "github.com/togethercomputer/slurm-operator/internal/utils/testutils" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/slurmclient/slurmclient_controller.go b/internal/controller/slurmclient/slurmclient_controller.go index b35d62af..cd9459eb 100644 --- a/internal/controller/slurmclient/slurmclient_controller.go +++ b/internal/controller/slurmclient/slurmclient_controller.go @@ -21,10 +21,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/utils/durationstore" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/utils/durationstore" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) const ( diff --git a/internal/controller/slurmclient/slurmclient_controller_test.go b/internal/controller/slurmclient/slurmclient_controller_test.go index 153b71f5..708ee3b4 100644 --- a/internal/controller/slurmclient/slurmclient_controller_test.go +++ b/internal/controller/slurmclient/slurmclient_controller_test.go @@ -11,8 +11,8 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) var _ = Describe("SlurmClient Controller", func() { diff --git a/internal/controller/slurmclient/slurmclient_sync.go b/internal/controller/slurmclient/slurmclient_sync.go index 84a179c8..b7ea3f5b 100644 --- a/internal/controller/slurmclient/slurmclient_sync.go +++ b/internal/controller/slurmclient/slurmclient_sync.go @@ -21,10 +21,10 @@ import ( slurmobject "github.com/SlinkyProject/slurm-client/pkg/object" slurmtypes "github.com/SlinkyProject/slurm-client/pkg/types" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/controller/nodeset/eventhandler" - "github.com/SlinkyProject/slurm-operator/internal/controller/token/slurmjwt" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/controller/nodeset/eventhandler" + "github.com/togethercomputer/slurm-operator/internal/controller/token/slurmjwt" ) // Sync implements control logic for synchronizing a Restapi. diff --git a/internal/controller/slurmclient/suite_test.go b/internal/controller/slurmclient/suite_test.go index e19ec31d..e040d72b 100644 --- a/internal/controller/slurmclient/suite_test.go +++ b/internal/controller/slurmclient/suite_test.go @@ -21,11 +21,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/clientmap" - "github.com/SlinkyProject/slurm-operator/internal/controller/controller" - "github.com/SlinkyProject/slurm-operator/internal/controller/restapi" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/clientmap" + "github.com/togethercomputer/slurm-operator/internal/controller/controller" + "github.com/togethercomputer/slurm-operator/internal/controller/restapi" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" //+kubebuilder:scaffold:imports ) diff --git a/internal/controller/token/slurmjwt/token.go b/internal/controller/token/slurmjwt/token.go index 5895085a..f7464144 100644 --- a/internal/controller/token/slurmjwt/token.go +++ b/internal/controller/token/slurmjwt/token.go @@ -8,7 +8,7 @@ import ( "math" "time" - "github.com/SlinkyProject/slurm-operator/internal/utils/mathutils" + "github.com/togethercomputer/slurm-operator/internal/utils/mathutils" jwt "github.com/golang-jwt/jwt/v5" "k8s.io/apimachinery/pkg/util/uuid" ) diff --git a/internal/controller/token/slurmjwt/token_test.go b/internal/controller/token/slurmjwt/token_test.go index 3b8d0802..5ac93206 100644 --- a/internal/controller/token/slurmjwt/token_test.go +++ b/internal/controller/token/slurmjwt/token_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/SlinkyProject/slurm-operator/internal/utils/crypto" + "github.com/togethercomputer/slurm-operator/internal/utils/crypto" ) func newSignedToken(signingKey []byte) string { diff --git a/internal/controller/token/suite_test.go b/internal/controller/token/suite_test.go index 44da8251..de90da96 100644 --- a/internal/controller/token/suite_test.go +++ b/internal/controller/token/suite_test.go @@ -19,8 +19,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" // +kubebuilder:scaffold:imports ) diff --git a/internal/controller/token/token_controller.go b/internal/controller/token/token_controller.go index c25e5d16..5f04884e 100644 --- a/internal/controller/token/token_controller.go +++ b/internal/controller/token/token_controller.go @@ -19,10 +19,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/builder" - "github.com/SlinkyProject/slurm-operator/internal/utils/durationstore" - "github.com/SlinkyProject/slurm-operator/internal/utils/refresolver" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/builder" + "github.com/togethercomputer/slurm-operator/internal/utils/durationstore" + "github.com/togethercomputer/slurm-operator/internal/utils/refresolver" ) const ( diff --git a/internal/controller/token/token_controller_test.go b/internal/controller/token/token_controller_test.go index 8a730ba5..b0df9188 100644 --- a/internal/controller/token/token_controller_test.go +++ b/internal/controller/token/token_controller_test.go @@ -9,8 +9,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) var _ = Describe("Token Controller", func() { diff --git a/internal/controller/token/token_sync.go b/internal/controller/token/token_sync.go index 496c1a14..baaafc38 100644 --- a/internal/controller/token/token_sync.go +++ b/internal/controller/token/token_sync.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/controller/token/slurmjwt" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/controller/token/slurmjwt" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) type SyncStep struct { diff --git a/internal/controller/token/token_sync_status.go b/internal/controller/token/token_sync_status.go index 3f526549..8738e582 100644 --- a/internal/controller/token/token_sync_status.go +++ b/internal/controller/token/token_sync_status.go @@ -15,10 +15,10 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/controller/token/slurmjwt" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/controller/token/slurmjwt" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) // syncStatus handles determining and updating the status. diff --git a/internal/controller/token/token_sync_status_test.go b/internal/controller/token/token_sync_status_test.go index 77b7f473..b427346f 100644 --- a/internal/controller/token/token_sync_status_test.go +++ b/internal/controller/token/token_sync_status_test.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func TestTokenReconciler_syncStatus(t *testing.T) { diff --git a/internal/utils/crypto/hash.go b/internal/utils/crypto/hash.go index 89d20551..1eb4af34 100644 --- a/internal/utils/crypto/hash.go +++ b/internal/utils/crypto/hash.go @@ -8,7 +8,7 @@ import ( "fmt" "sort" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func CheckSum(b []byte) string { diff --git a/internal/utils/objectutils/delete.go b/internal/utils/objectutils/delete.go index 1a621e5a..e093f1c2 100644 --- a/internal/utils/objectutils/delete.go +++ b/internal/utils/objectutils/delete.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) func DeleteObject(c client.Client, ctx context.Context, newObj client.Object) error { diff --git a/internal/utils/objectutils/delete_test.go b/internal/utils/objectutils/delete_test.go index e3dd0265..b428b84e 100644 --- a/internal/utils/objectutils/delete_test.go +++ b/internal/utils/objectutils/delete_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/utils/objectutils/patch.go b/internal/utils/objectutils/patch.go index 5e02d386..5b955d82 100644 --- a/internal/utils/objectutils/patch.go +++ b/internal/utils/objectutils/patch.go @@ -17,8 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) func SyncObject(c client.Client, ctx context.Context, newObj client.Object, shouldUpdate bool) error { diff --git a/internal/utils/objectutils/patch_test.go b/internal/utils/objectutils/patch_test.go index c4f6e842..33a8411f 100644 --- a/internal/utils/objectutils/patch_test.go +++ b/internal/utils/objectutils/patch_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/utils/podutils/pod.go b/internal/utils/podutils/pod.go index f28e3e14..36efcb9e 100644 --- a/internal/utils/podutils/pod.go +++ b/internal/utils/podutils/pod.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // IsPodCordon returns true if and only if the delete annotation is nodeset to true. diff --git a/internal/utils/refresolver/refresolver.go b/internal/utils/refresolver/refresolver.go index e87edde8..182f1570 100644 --- a/internal/utils/refresolver/refresolver.go +++ b/internal/utils/refresolver/refresolver.go @@ -11,8 +11,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" ) type RefResolver struct { diff --git a/internal/utils/refresolver/refresolver_test.go b/internal/utils/refresolver/refresolver_test.go index d7e669fc..5ba6735d 100644 --- a/internal/utils/refresolver/refresolver_test.go +++ b/internal/utils/refresolver/refresolver_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/objectutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/objectutils" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/utils/testutils/helpers.go b/internal/utils/testutils/helpers.go index 98baa169..3af378df 100644 --- a/internal/utils/testutils/helpers.go +++ b/internal/utils/testutils/helpers.go @@ -11,7 +11,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) const Timeout = 30 * time.Second diff --git a/internal/utils/testutils/helpers_test.go b/internal/utils/testutils/helpers_test.go index f3fb5b6f..a28ab582 100644 --- a/internal/utils/testutils/helpers_test.go +++ b/internal/utils/testutils/helpers_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/internal/webhook/accounting_webhook.go b/internal/webhook/accounting_webhook.go index ca8a36d4..6f7f9530 100644 --- a/internal/webhook/accounting_webhook.go +++ b/internal/webhook/accounting_webhook.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/internal/webhook/controller_webhook.go b/internal/webhook/controller_webhook.go index 12e04909..6de6b0fd 100644 --- a/internal/webhook/controller_webhook.go +++ b/internal/webhook/controller_webhook.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/structutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/structutils" ) // TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/internal/webhook/loginset_webhook.go b/internal/webhook/loginset_webhook.go index 077607f4..c00081db 100644 --- a/internal/webhook/loginset_webhook.go +++ b/internal/webhook/loginset_webhook.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/internal/webhook/nodeset_webhook.go b/internal/webhook/nodeset_webhook.go index 75405039..5f6fece8 100644 --- a/internal/webhook/nodeset_webhook.go +++ b/internal/webhook/nodeset_webhook.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/internal/webhook/restapi_webhook.go b/internal/webhook/restapi_webhook.go index 0bb12981..ebad2dac 100644 --- a/internal/webhook/restapi_webhook.go +++ b/internal/webhook/restapi_webhook.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/internal/webhook/token_webhook.go b/internal/webhook/token_webhook.go index 5c02d174..4cca695b 100644 --- a/internal/webhook/token_webhook.go +++ b/internal/webhook/token_webhook.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" ) // TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/internal/webhook/webhook_suite_test.go b/internal/webhook/webhook_suite_test.go index 187df9a3..442aa28c 100644 --- a/internal/webhook/webhook_suite_test.go +++ b/internal/webhook/webhook_suite_test.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" - "github.com/SlinkyProject/slurm-operator/internal/utils/testutils" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" + "github.com/togethercomputer/slurm-operator/internal/utils/testutils" ) // These tests use Ginkgo (BDD-style Go testing framework). Refer to diff --git a/pkg/taints/taints.go b/pkg/taints/taints.go index 0eac3f12..ad0d01d0 100644 --- a/pkg/taints/taints.go +++ b/pkg/taints/taints.go @@ -4,7 +4,7 @@ package taints import ( - slinkyv1beta1 "github.com/SlinkyProject/slurm-operator/api/v1beta1" + slinkyv1beta1 "github.com/togethercomputer/slurm-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" )