Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: rename utils to podspec #78

Merged
merged 3 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: ^1.19
go-version: ^1.21

- name: Build Containers
run: |
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: ^1.19
go-version: ^1.21

- name: Build Containers
run: |
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: ^1.19
go-version: ^1.21

- name: Build Container
run: |
Expand Down
4 changes: 2 additions & 2 deletions sig-scheduler-plugins/pkg/fluence/core/flux.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
fgroup "sigs.k8s.io/scheduler-plugins/pkg/fluence/group"

"sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
"sigs.k8s.io/scheduler-plugins/pkg/fluence/utils"
"sigs.k8s.io/scheduler-plugins/pkg/fluence/podspec"

corev1 "k8s.io/api/core/v1"
)
Expand Down Expand Up @@ -47,7 +47,7 @@ func (podGroupManager *PodGroupManager) AskFlux(
// IMPORTANT: this is a JobSpec for *one* pod, assuming they are all the same.
// This obviously may not be true if we have a hetereogenous PodGroup.
// We name it based on the group, since it will represent the group
jobspec := utils.PreparePodJobSpec(&pod, groupName)
jobspec := podspec.PreparePodJobSpec(&pod, groupName)
podGroupManager.log.Info("[PodGroup AskFlux] Inspect pod info, jobspec: %s\n", jobspec)
conn, err := grpc.Dial("127.0.0.1:4242", grpc.WithInsecure())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package utils
package podspec

import (
"strings"
Expand Down
2 changes: 1 addition & 1 deletion src/build/scheduler/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt -y update && apt -y upgrade && apt install --no-install-recommends -y pr
go install google.golang.org/grpc/cmd/[email protected]

# These need to be on the LD_LIBRARY_PATH for the server to find at runtime
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib:/usr/lib/flux
ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib/flux
WORKDIR /go/src/fluence/
COPY fluence Makefile /go/src/fluence/

Expand Down
Loading