Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

Commit

Permalink
personalizing repo
Browse files Browse the repository at this point in the history
  • Loading branch information
AhmedTremo committed Aug 11, 2024
1 parent a666d46 commit 4bdcafb
Show file tree
Hide file tree
Showing 35 changed files with 133 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/notify-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: New Issue Notification
steps:
- run: |
echo "{\"text\":\"slik : New Issue https://github.com/vultr/slik/issues/${{ github.event.issue.number }} \"}" > mattermost.json
echo "{\"text\":\"slik : New Issue https://github.com/ahmedtremo/slik/issues/${{ github.event.issue.number }} \"}" > mattermost.json
- uses: mattermost/action-mattermost-notify@master
env:
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notify-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Pull Request Notification
steps:
- run: |
echo "{\"text\":\"slik : PR https://github.com/vultr/slik/pull/${{ github.event.number }} \"}" > mattermost.json
echo "{\"text\":\"slik : PR https://github.com/ahmedtremo/slik/pull/${{ github.event.number }} \"}" > mattermost.json
- uses: mattermost/action-mattermost-notify@master
with:
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
docker login https://ewr.vultrcr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
docker login https://slurmacr.azurecr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v6
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
docker login https://ewr.vultrcr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
docker login https://slurmacr.azurecr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
- name: Build and push
uses: docker/build-push-action@v5
Expand All @@ -105,8 +105,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
ewr.vultrcr.com/slurm/munged:${{ needs.create-tag.outputs.new_tag }}
ewr.vultrcr.com/slurm/munged:latest
slurmacr.azurecr.com/slurm/munged:${{ needs.create-tag.outputs.new_tag }}
slurmacr.azurecr.com/slurm/munged:latest
slurmctld:
runs-on: ubuntu-latest
Expand All @@ -124,7 +124,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
docker login https://ewr.vultrcr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
docker login https://slurmacr.azurecr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
- name: Build and push
uses: docker/build-push-action@v5
Expand All @@ -133,8 +133,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
ewr.vultrcr.com/slurm/slurmctld:${{ needs.create-tag.outputs.new_tag }}
ewr.vultrcr.com/slurm/slurmctld:latest
slurmacr.azurecr.com/slurm/slurmctld:${{ needs.create-tag.outputs.new_tag }}
slurmacr.azurecr.com/slurm/slurmctld:latest
slurmd:
runs-on: ubuntu-latest
Expand All @@ -152,7 +152,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
docker login https://ewr.vultrcr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
docker login https://slurmacr.azurecr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
- name: Build and push
uses: docker/build-push-action@v5
Expand All @@ -161,8 +161,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
ewr.vultrcr.com/slurm/slurmd:${{ needs.create-tag.outputs.new_tag }}
ewr.vultrcr.com/slurm/slurmd:latest
slurmacr.azurecr.com/slurm/slurmd:${{ needs.create-tag.outputs.new_tag }}
slurmacr.azurecr.com/slurm/slurmd:latest
toolbox:
runs-on: ubuntu-latest
Expand All @@ -180,7 +180,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
docker login https://ewr.vultrcr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
docker login https://slurmacr.azurecr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
- name: Build and push
uses: docker/build-push-action@v5
Expand All @@ -189,8 +189,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
ewr.vultrcr.com/slurm/toolbox:${{ needs.create-tag.outputs.new_tag }}
ewr.vultrcr.com/slurm/toolbox:latest
slurmacr.azurecr.com/slurm/toolbox:${{ needs.create-tag.outputs.new_tag }}
slurmacr.azurecr.com/slurm/toolbox:latest
slurmdbd:
runs-on: ubuntu-latest
Expand All @@ -208,7 +208,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
docker login https://ewr.vultrcr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
docker login https://slurmacr.azurecr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
- name: Build and push
uses: docker/build-push-action@v5
Expand All @@ -217,8 +217,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
ewr.vultrcr.com/slurm/slurmdbd:${{ needs.create-tag.outputs.new_tag }}
ewr.vultrcr.com/slurm/slurmdbd:latest
slurmacr.azurecr.com/slurm/slurmdbd:${{ needs.create-tag.outputs.new_tag }}
slurmacr.azurecr.com/slurm/slurmdbd:latest
slurmrestd:
runs-on: ubuntu-latest
Expand All @@ -236,7 +236,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
docker login https://ewr.vultrcr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
docker login https://slurmacr.azurecr.com/slurm -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
- name: Build and push
uses: docker/build-push-action@v5
Expand All @@ -245,8 +245,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
ewr.vultrcr.com/slurm/slurmrestd:${{ needs.create-tag.outputs.new_tag }}
ewr.vultrcr.com/slurm/slurmrestd:latest
slurmacr.azurecr.com/slurm/slurmrestd:${{ needs.create-tag.outputs.new_tag }}
slurmacr.azurecr.com/slurm/slurmrestd:latest
release:
runs-on: ubuntu-latest
Expand Down
40 changes: 20 additions & 20 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dockers:
- "--pull"
- "--platform=linux/amd64"
image_templates:
- "ewr.vultrcr.com/slurm/slik:latest-amd64"
- "ewr.vultrcr.com/slurm/slik:{{ .Tag }}-amd64"
- "slurmacr.azurecr.com/slurm/slik:latest-amd64"
- "slurmacr.azurecr.com/slurm/slik:{{ .Tag }}-amd64"
extra_files:
- "cmd/slik/config.yaml"
ids:
Expand All @@ -54,8 +54,8 @@ dockers:
- "--pull"
- "--platform=linux/arm64/v8"
image_templates:
- "ewr.vultrcr.com/slurm/slik:latest-arm64"
- "ewr.vultrcr.com/slurm/slik:{{ .Tag }}-arm64"
- "slurmacr.azurecr.com/slurm/slik:latest-arm64"
- "slurmacr.azurecr.com/slurm/slik:{{ .Tag }}-arm64"
extra_files:
- "cmd/slik/config.yaml"
ids:
Expand All @@ -67,8 +67,8 @@ dockers:
- "--pull"
- "--platform=linux/amd64"
image_templates:
- "ewr.vultrcr.com/slurm/slurmabler:latest-amd64"
- "ewr.vultrcr.com/slurm/slurmabler:{{ .Tag }}-amd64"
- "slurmacr.azurecr.com/slurm/slurmabler:latest-amd64"
- "slurmacr.azurecr.com/slurm/slurmabler:{{ .Tag }}-amd64"
ids:
- slurmabler

Expand All @@ -79,31 +79,31 @@ dockers:
- "--pull"
- "--platform=linux/arm64/v8"
image_templates:
- "ewr.vultrcr.com/slurm/slurmabler:latest-arm64"
- "ewr.vultrcr.com/slurm/slurmabler:{{ .Tag }}-arm64"
- "slurmacr.azurecr.com/slurm/slurmabler:latest-arm64"
- "slurmacr.azurecr.com/slurm/slurmabler:{{ .Tag }}-arm64"
ids:
- slurmabler

docker_manifests:
- name_template: 'ewr.vultrcr.com/slurm/slik:latest'
- name_template: 'slurmacr.azurecr.com/slurm/slik:latest'
image_templates:
- 'ewr.vultrcr.com/slurm/slik:latest-amd64'
- 'ewr.vultrcr.com/slurm/slik:latest-arm64'
- 'slurmacr.azurecr.com/slurm/slik:latest-amd64'
- 'slurmacr.azurecr.com/slurm/slik:latest-arm64'

- name_template: 'ewr.vultrcr.com/slurm/slik:{{ .Tag }}'
- name_template: 'slurmacr.azurecr.com/slurm/slik:{{ .Tag }}'
image_templates:
- 'ewr.vultrcr.com/slurm/slik:{{ .Tag }}-amd64'
- 'ewr.vultrcr.com/slurm/slik:{{ .Tag }}-arm64'
- 'slurmacr.azurecr.com/slurm/slik:{{ .Tag }}-amd64'
- 'slurmacr.azurecr.com/slurm/slik:{{ .Tag }}-arm64'

- name_template: 'ewr.vultrcr.com/slurm/slurmabler:latest'
- name_template: 'slurmacr.azurecr.com/slurm/slurmabler:latest'
image_templates:
- 'ewr.vultrcr.com/slurm/slurmabler:latest-amd64'
- 'ewr.vultrcr.com/slurm/slurmabler:latest-arm64'
- 'slurmacr.azurecr.com/slurm/slurmabler:latest-amd64'
- 'slurmacr.azurecr.com/slurm/slurmabler:latest-arm64'

- name_template: 'ewr.vultrcr.com/slurm/slurmabler:{{ .Tag }}'
- name_template: 'slurmacr.azurecr.com/slurm/slurmabler:{{ .Tag }}'
image_templates:
- 'ewr.vultrcr.com/slurm/slurmabler:{{ .Tag }}-amd64'
- 'ewr.vultrcr.com/slurm/slurmabler:{{ .Tag }}-arm64'
- 'slurmacr.azurecr.com/slurm/slurmabler:{{ .Tag }}-amd64'
- 'slurmacr.azurecr.com/slurm/slurmabler:{{ .Tag }}-arm64'

release:
draft: false
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ You then interact with the slurm cluster through the toolbox pod: `kubectl exec
Sample yaml:

```yaml
apiVersion: "hpc.vultr.com/v1"
apiVersion: "ahmedtremo.com/v1"
kind: Slik
metadata:
name: full
Expand All @@ -28,8 +28,8 @@ spec:
slurmdbd: true
slurmrestd: true
mariadb:
storage_size: 50G
storage_class: vultr-block-storage-hdd-retain
storage_size: 5G
storage_class: default
```
Update operations are not currently supported, you should rebuild the cluster instead. Delete the slurm deployment, then re-create it. If you use a PVC that is retained you should not lose any data.
Expand Down
14 changes: 7 additions & 7 deletions cmd/slik/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ probes_api:
port: 9093
slurm:
slurmabler:
image: "ewr.vultrcr.com/slurm/slurmabler:v0.0.120"
image: "slurmacr.azurecr.io/slurm/slurmd:v0.0.1"
service_account: "slik"
munged:
image: "ewr.vultrcr.com/slurm/munged:v0.0.120"
image: "slurmacr.azurecr.io/slurm/munged:v0.0.1"
slurmctld:
image: "ewr.vultrcr.com/slurm/slurmctld:v0.0.120"
image: "slurmacr.azurecr.io/slurm/slurmctld:v0.0.1"
slurmd:
image: "ewr.vultrcr.com/slurm/slurmd:v0.0.120"
image: "slurmacr.azurecr.io/slurm/slurmd:v0.0.1"
slurm_toolbox:
image: "ewr.vultrcr.com/slurm/toolbox:v0.0.120"
image: "slurmacr.azurecr.io/slurm/toolbox:v0.0.1"
mariadb:
image: 11.4.2-noble
slurmdbd:
image: "ewr.vultrcr.com/slurm/slurmdbd:v0.0.120"
image: "slurmacr.azurecr.io/slurm/slurmdbd:v0.0.1"
slurmrestd:
image: "ewr.vultrcr.com/slurm/slurmrestd:v0.0.120"
image: "slurmacr.azurecr.io/slurm/slurmrestd:v0.0.1"
10 changes: 5 additions & 5 deletions cmd/slik/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"context"
"time"

"github.com/vultr/slik/cmd/slik/config"
"github.com/vultr/slik/cmd/slik/metrics"
"github.com/vultr/slik/pkg/helpers"
"github.com/vultr/slik/pkg/probes"
"github.com/vultr/slik/pkg/reconciler"
"github.com/AhmedTremo/slik/cmd/slik/config"
"github.com/AhmedTremo/slik/cmd/slik/metrics"
"github.com/AhmedTremo/slik/pkg/helpers"
"github.com/AhmedTremo/slik/pkg/probes"
"github.com/AhmedTremo/slik/pkg/reconciler"

"go.uber.org/zap"
"golang.org/x/sync/errgroup"
Expand Down
22 changes: 11 additions & 11 deletions cmd/slurmabler/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"os/exec"
"time"

"github.com/vultr/slik/cmd/slurmabler/config"
"github.com/vultr/slik/pkg/connectors"
"github.com/vultr/slik/pkg/labeler"
"github.com/vultr/slik/pkg/slurm"
"github.com/AhmedTremo/slik/cmd/slurmabler/config"
"github.com/AhmedTremo/slik/pkg/connectors"
"github.com/AhmedTremo/slik/pkg/labeler"
"github.com/AhmedTremo/slik/pkg/slurm"

"go.uber.org/zap"
)
Expand Down Expand Up @@ -61,13 +61,13 @@ func main() { //nolint
}

labels := node.GetLabels()
labels["slik.vultr.com/nodename"] = labeler.NodeName
labels["slik.vultr.com/cpus"] = fmt.Sprintf("%d", labeler.CPUs)
labels["slik.vultr.com/boards"] = fmt.Sprintf("%d", labeler.Boards)
labels["slik.vultr.com/sockets_per_board"] = fmt.Sprintf("%d", labeler.SocketsPerBoard)
labels["slik.vultr.com/cores_per_socket"] = fmt.Sprintf("%d", labeler.CoresPerSocket)
labels["slik.vultr.com/threads_per_core"] = fmt.Sprintf("%d", labeler.ThreadsPerCore)
labels["slik.vultr.com/real_memory"] = fmt.Sprintf("%d", labeler.RealMemory)
labels["slik.AhmedTremo.com/nodename"] = labeler.NodeName
labels["slik.AhmedTremo.com/cpus"] = fmt.Sprintf("%d", labeler.CPUs)
labels["slik.AhmedTremo.com/boards"] = fmt.Sprintf("%d", labeler.Boards)
labels["slik.AhmedTremo.com/sockets_per_board"] = fmt.Sprintf("%d", labeler.SocketsPerBoard)
labels["slik.AhmedTremo.com/cores_per_socket"] = fmt.Sprintf("%d", labeler.CoresPerSocket)
labels["slik.AhmedTremo.com/threads_per_core"] = fmt.Sprintf("%d", labeler.ThreadsPerCore)
labels["slik.AhmedTremo.com/real_memory"] = fmt.Sprintf("%d", labeler.RealMemory)

node.Labels = labels

Expand Down
8 changes: 4 additions & 4 deletions crds/v1/crds.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: sliks.hpc.vultr.com
name: sliks.ahmedtremo.com
spec:
group: hpc.vultr.com
group: ahmedtremo.com
versions:
- additionalPrinterColumns:
- jsonPath: .status.state
Expand Down Expand Up @@ -36,11 +36,11 @@ spec:
properties:
storage_size:
type: string
default: 40G
default: 5G
pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
storage_class:
type: string
default: vultr-block-storage-hdd-retain
default: default
required:
- namespace
- slurmdbd
Expand Down
2 changes: 1 addition & 1 deletion dockers/munged/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 as builder
FROM ubuntu:22.04

RUN apt update && apt upgrade -y && apt install ca-certificates git -y
RUN apt install munge -y
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/vultr/slik
module github.com/AhmedTremo/slik

go 1.22.0

Expand Down
4 changes: 2 additions & 2 deletions helm/slik/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: slik
version: 0.0.1
description: A Helm chart for slik
type: application
home: https://github.com/vultr/slik
home: https://github.com/AhmedTremo/slik
sources:
- https://github.com/vultr/slik
- https://github.com/AhmedTremo/slik
maintainers:
- name: Josten Landtroop
6 changes: 3 additions & 3 deletions helm/slik/templates/crds.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: sliks.hpc.vultr.com
name: sliks.ahmedtremo.com
spec:
group: hpc.vultr.com
group: ahmedtremo.com
versions:
- additionalPrinterColumns:
- jsonPath: .status.state
Expand Down Expand Up @@ -40,7 +40,7 @@ spec:
pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
storage_class:
type: string
default: vultr-block-storage-hdd-retain
default: default
required:
- namespace
- slurmdbd
Expand Down
Loading

0 comments on commit 4bdcafb

Please sign in to comment.