Skip to content

Commit

Permalink
Merge pull request #33 from dciangot/rework
Browse files Browse the repository at this point in the history
Rework for pure VK implementation
  • Loading branch information
dciangot authored Jul 24, 2023
2 parents b81a028 + 7ae3821 commit 975dadd
Show file tree
Hide file tree
Showing 653 changed files with 408 additions and 116,392 deletions.
96 changes: 0 additions & 96 deletions .github/workflows/build_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,99 +68,3 @@ jobs:
ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/virtual-kubelet-inttw-refresh:${{ env.RELEASE_VERSION }}
file: ./docker/Dockerfile.refresh-token
platforms: linux/amd64, linux/arm64

interlink:
runs-on: ubuntu-latest
#env:
# DOCKER_TARGET_PLATFORM: linux/arm64
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Get Repo Owner
id: get_repo_owner
run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
- name: Build container base image
uses: docker/build-push-action@v4
with:
context: ./
outputs: "type=registry,push=true"
tags: |
ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink:${{ env.RELEASE_VERSION }}
file: ./docker/Dockerfile.interlink
platforms: linux/amd64, linux/arm64, linux/ppc64le

sidecar-docker:
runs-on: ubuntu-latest
#env:
# DOCKER_TARGET_PLATFORM: linux/arm64
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Get Repo Owner
id: get_repo_owner
run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
- name: Build container base image
uses: docker/build-push-action@v4
with:
context: ./
outputs: "type=registry,push=true"
tags: |
ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink-sidecar-docker:${{ env.RELEASE_VERSION }}
file: ./docker/Dockerfile.sidecar-docker
platforms: linux/amd64, linux/arm64, linux/ppc64le

sidecar-slurm:
runs-on: ubuntu-latest
#env:
# DOCKER_TARGET_PLATFORM: linux/arm64
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Get Repo Owner
id: get_repo_owner
run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
- name: Build container base image
uses: docker/build-push-action@v4
with:
context: ./
outputs: "type=registry,push=true"
tags: |
ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/interlink-sidecar-slurm:${{ env.RELEASE_VERSION }}
file: ./docker/Dockerfile.sidecar-slurm
platforms: linux/amd64, linux/arm64, linux/ppc64le
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ Fastest way to start using interlink, is by deploying a VK in Kubernetes using t

```bash
kubectl create ns vk
kubectl kustomize ./kustomizations -n vk
kubectl apply -n vk -k ./kustomizations
```

Expand Down
18 changes: 0 additions & 18 deletions docker/Dockerfile.interlink

This file was deleted.

19 changes: 0 additions & 19 deletions docker/Dockerfile.sidecar-docker

This file was deleted.

19 changes: 0 additions & 19 deletions docker/Dockerfile.sidecar-slurm

This file was deleted.

6 changes: 4 additions & 2 deletions examples/busyecho_k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ metadata:
spec:
restartPolicy: OnFailure
containers:
- image: /cvmfs/unpacked.cern.ch/registry.hub.docker.com/cmssw/el8:x86_64
#- image: /cvmfs/unpacked.cern.ch/registry.hub.docker.com/cmssw/el8:x86_64
- image: busybox
volumeMounts:
- name: foo
mountPath: "/etc/foo"
readOnly: true
command:
- $HOME/script.sh
- sleep
- infinity
imagePullPolicy: Always
name: busyecho
dnsPolicy: ClusterFirst
Expand Down
25 changes: 6 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
module github.com/intertwin-eu/interlink

go 1.18
go 1.20

require (
contrib.go.opencensus.io/exporter/ocagent v0.5.0
github.com/CARV-ICS-FORTH/knoc v0.0.0-20230201071611-e1c17e3b6ae6
github.com/alexellis/go-execute v0.5.0
github.com/containerd/containerd v1.0.2
github.com/sirupsen/logrus v1.4.2
github.com/virtual-kubelet/node-cli v0.1.2
github.com/virtual-kubelet/virtual-kubelet v1.2.0
go.opencensus.io v0.22.0
gopkg.in/yaml.v2 v2.2.2
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
Expand All @@ -19,43 +15,34 @@ require (
)

require (
github.com/census-instrumentation/opencensus-proto v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidmz/go-pageant v1.0.1 // indirect
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/golang/protobuf v1.3.1 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/googleapis/gnostic v0.1.0 // indirect
github.com/gorilla/mux v1.7.3 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
github.com/gorilla/mux v1.7.0 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.6 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.0 // indirect
github.com/sfreiberg/simplessh v0.0.0-20180301191542-495cbb862a9c // indirect
github.com/spf13/cobra v0.0.5 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/stretchr/testify v1.6.1 // indirect
go.opencensus.io v0.21.0 // indirect
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210927052749-1cf2251ac284 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
google.golang.org/api v0.4.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.5.0 // indirect
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb // indirect
google.golang.org/grpc v1.23.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 975dadd

Please sign in to comment.