Skip to content

Commit 1d7fb6c

Browse files
committed
Merge origin/main into vgpu
Resolved conflicts: - cmd/api/main.go: Added devices import for mdev reconciliation - lib/devices/GPU.md: Merged vGPU API docs with driver upgrade docs - lib/instances/configdisk.go: Updated import paths to kernel - lib/instances/delete.go: Added devices import for mdev cleanup - lib/oapi/oapi.go: Regenerated to include GPU types - lib/system/initrd.go: Updated import paths to kernel - lib/system/versions.go: Added NVIDIA module/driver URL maps Also updated import paths from onkernel to kernel in: - integration/vgpu_test.go - lib/devices/mdev.go - lib/resources/gpu.go
2 parents 6f74c81 + e77731d commit 1d7fb6c

File tree

151 files changed

+9159
-745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+9159
-745
lines changed

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ changelog:
6565

6666
release:
6767
github:
68-
owner: onkernel
68+
owner: kernel
6969
name: hypeman
7070
prerelease: auto
7171
draft: false

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,17 @@ test: ensure-ch-binaries ensure-caddy-binaries build-embedded
206206
gen-jwt: $(GODOTENV)
207207
@$(GODOTENV) -f .env go run ./cmd/gen-jwt -user-id $${USER_ID:-test-user}
208208

209+
# Build the generic builder image for builds
210+
build-builder:
211+
docker build -t hypeman/builder:latest -f lib/builds/images/generic/Dockerfile .
212+
213+
# Alias for backwards compatibility
214+
build-builders: build-builder
215+
216+
# Run E2E build system test (requires server running: make dev)
217+
e2e-build-test:
218+
@./scripts/e2e-build-test.sh
219+
209220
# Clean generated files and binaries
210221
clean:
211222
rm -rf $(BIN_DIR)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<p align="center">
1515
<strong>Run containerized workloads in VMs, powered by <a href="https://github.com/cloud-hypervisor/cloud-hypervisor">Cloud Hypervisor</a>.</strong>
16-
<img alt="GitHub License" src="https://img.shields.io/github/license/onkernel/hypeman">
16+
<img alt="GitHub License" src="https://img.shields.io/github/license/kernel/hypeman">
1717
<a href="https://discord.gg/FBrveQRcud"><img src="https://img.shields.io/discord/1342243238748225556?logo=discord&logoColor=white&color=7289DA" alt="Discord"></a>
1818
</p>
1919

@@ -39,12 +39,12 @@ To connect to a Hypeman server from another machine, install just the CLI:
3939

4040
**Homebrew:**
4141
```bash
42-
brew install onkernel/tap/hypeman
42+
brew install kernel/tap/hypeman
4343
```
4444

4545
**Go:**
4646
```bash
47-
go install 'github.com/onkernel/hypeman-cli/cmd/hypeman@latest'
47+
go install 'github.com/kernel/hypeman-cli/cmd/hypeman@latest'
4848
```
4949

5050
**Configure remote access:**

RELEASES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ This project uses [Semantic Versioning](https://semver.org/).
1313
## Getting Binaries
1414

1515
### Released Version
16-
Download from the [Releases](https://github.com/onkernel/hypeman/releases) page.
16+
Download from the [Releases](https://github.com/kernel/hypeman/releases) page.
1717

1818
### Building from Source
1919
```bash
20-
git clone https://github.com/onkernel/hypeman
20+
git clone https://github.com/kernel/hypeman
2121
cd hypeman
2222
make build
2323
# Binary at ./bin/hypeman

cmd/api/api/api.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package api
22

33
import (
4-
"github.com/onkernel/hypeman/cmd/api/config"
5-
"github.com/onkernel/hypeman/lib/devices"
6-
"github.com/onkernel/hypeman/lib/images"
7-
"github.com/onkernel/hypeman/lib/ingress"
8-
"github.com/onkernel/hypeman/lib/instances"
9-
"github.com/onkernel/hypeman/lib/network"
10-
"github.com/onkernel/hypeman/lib/oapi"
11-
"github.com/onkernel/hypeman/lib/resources"
12-
"github.com/onkernel/hypeman/lib/volumes"
4+
"github.com/kernel/hypeman/cmd/api/config"
5+
"github.com/kernel/hypeman/lib/builds"
6+
"github.com/kernel/hypeman/lib/devices"
7+
"github.com/kernel/hypeman/lib/images"
8+
"github.com/kernel/hypeman/lib/ingress"
9+
"github.com/kernel/hypeman/lib/instances"
10+
"github.com/kernel/hypeman/lib/network"
11+
"github.com/kernel/hypeman/lib/oapi"
12+
"github.com/kernel/hypeman/lib/resources"
13+
"github.com/kernel/hypeman/lib/volumes"
1314
)
1415

1516
// ApiService implements the oapi.StrictServerInterface
@@ -21,6 +22,7 @@ type ApiService struct {
2122
NetworkManager network.Manager
2223
DeviceManager devices.Manager
2324
IngressManager ingress.Manager
25+
BuildManager builds.Manager
2426
ResourceManager *resources.Manager
2527
}
2628

@@ -35,6 +37,7 @@ func New(
3537
networkManager network.Manager,
3638
deviceManager devices.Manager,
3739
ingressManager ingress.Manager,
40+
buildManager builds.Manager,
3841
resourceManager *resources.Manager,
3942
) *ApiService {
4043
return &ApiService{
@@ -45,6 +48,7 @@ func New(
4548
NetworkManager: networkManager,
4649
DeviceManager: deviceManager,
4750
IngressManager: ingressManager,
51+
BuildManager: buildManager,
4852
ResourceManager: resourceManager,
4953
}
5054
}

cmd/api/api/api_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/onkernel/hypeman/cmd/api/config"
12-
"github.com/onkernel/hypeman/lib/devices"
13-
"github.com/onkernel/hypeman/lib/images"
14-
"github.com/onkernel/hypeman/lib/instances"
15-
mw "github.com/onkernel/hypeman/lib/middleware"
16-
"github.com/onkernel/hypeman/lib/network"
17-
"github.com/onkernel/hypeman/lib/oapi"
18-
"github.com/onkernel/hypeman/lib/paths"
19-
"github.com/onkernel/hypeman/lib/resources"
20-
"github.com/onkernel/hypeman/lib/system"
21-
"github.com/onkernel/hypeman/lib/volumes"
11+
"github.com/kernel/hypeman/cmd/api/config"
12+
"github.com/kernel/hypeman/lib/devices"
13+
"github.com/kernel/hypeman/lib/images"
14+
"github.com/kernel/hypeman/lib/instances"
15+
mw "github.com/kernel/hypeman/lib/middleware"
16+
"github.com/kernel/hypeman/lib/network"
17+
"github.com/kernel/hypeman/lib/oapi"
18+
"github.com/kernel/hypeman/lib/paths"
19+
"github.com/kernel/hypeman/lib/resources"
20+
"github.com/kernel/hypeman/lib/system"
21+
"github.com/kernel/hypeman/lib/volumes"
2222
"github.com/stretchr/testify/require"
2323
)
2424

0 commit comments

Comments
 (0)