Skip to content
Closed
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
21 changes: 21 additions & 0 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,27 @@ jobs:
- name: Run chart-testing (install)
run: ct install --target-branch ${{ github.event.repository.default_branch }}

go-test:
name: Go build, vet, and unit tests
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

- name: Set up Go
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
with:
go-version-file: 'go.mod'

- name: Build
run: go build ./...

- name: Vet
run: go vet ./...

- name: Unit tests
run: go test ./...

generate-check:
name: CRD generation up-to-date
runs-on: ubuntu-latest
Expand Down
319 changes: 203 additions & 116 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This guide walks you through installing the Obol Stack, starting a local Kuberne
Run the bootstrap installer:

```bash
bash <(curl -s https://stack.obol.org)
bash <(curl -fsSL https://stack.obol.org)
```

This installs the `obol` CLI and all required tools (kubectl, helm, k3d, helmfile, k9s) to `~/.local/bin/`.
Expand Down
12 changes: 0 additions & 12 deletions internal/embed/infrastructure/base/templates/llm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -403,18 +403,6 @@ spec:
persistentVolumeClaim:
claimName: x402-buyer-state

---
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: litellm
namespace: llm
spec:
minAvailable: 1
selector:
matchLabels:
app: litellm

---
apiVersion: v1
kind: Service
Expand Down
7 changes: 7 additions & 0 deletions internal/embed/infrastructure/base/templates/local-path.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ spec:
- rancher.io/local-path
- --helper-image
- rancher/mirrored-library-busybox:1.36.1
resources:
requests:
cpu: 10m
memory: 64Mi
limits:
cpu: 200m
memory: 256Mi
volumeMounts:
- name: config-volume
mountPath: /etc/config/
Expand Down
2 changes: 1 addition & 1 deletion internal/embed/infrastructure/cloudflared/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ quickTunnel:
url: "http://traefik.traefik.svc.cluster.local:80"

persistent:
replicaCount: 2
replicaCount: 1

management:
configMapName: "cloudflared-management"
Expand Down
10 changes: 10 additions & 0 deletions internal/embed/infrastructure/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ releases:
createNamespace: true
chart: stakater/reloader
version: 2.2.7
values:
- reloader:
deployment:
resources:
requests:
cpu: 10m
memory: 64Mi
limits:
cpu: 100m
memory: 256Mi

# eRPC
- name: erpc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ service:
type: ClusterIP
port: 3000

resources:
requests:
cpu: 50m
memory: 128Mi
limits:
cpu: 500m
memory: 512Mi

podSecurityContext:
fsGroup: 1001

Expand Down
5 changes: 5 additions & 0 deletions internal/schemas/service-catalog.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@
"type": "object",
"additionalProperties": false,
"required": [
"schemaVersion",
"displayName",
"tagline",
"logoUrl",
"services"
],
"properties": {
"schemaVersion": {
"const": "1",
"description": "Envelope wire version. Bumped only on breaking changes; additive fields do not bump it."
},
"displayName": {
"type": "string",
"minLength": 1
Expand Down
18 changes: 14 additions & 4 deletions internal/schemas/service_catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,20 @@ type StorefrontProfile struct {
ContactEmail string `json:"contactEmail,omitempty"`
}

// ServiceCatalogSchemaVersion is the current version of the
// /api/services.json envelope. Bump only on a breaking change to the wire
// shape; additive fields do not bump the version. Integrators/indexers use
// it to detect incompatible catalogs instead of guessing from field shapes.
const ServiceCatalogSchemaVersion = "1"

// ServiceCatalog is the public /api/services.json envelope.
type ServiceCatalog struct {
DisplayName string `json:"displayName"`
Tagline string `json:"tagline"`
LogoURL string `json:"logoUrl"`
Services []ServiceCatalogEntry `json:"services"`
// SchemaVersion identifies the envelope wire version (currently "1").
// Always populated by the controller; consumers should treat an absent
// field as a legacy pre-versioning catalog.
SchemaVersion string `json:"schemaVersion"`
DisplayName string `json:"displayName"`
Tagline string `json:"tagline"`
LogoURL string `json:"logoUrl"`
Services []ServiceCatalogEntry `json:"services"`
}
5 changes: 5 additions & 0 deletions internal/serviceoffercontroller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,11 @@ func (c *Controller) reconcileSkillCatalog(ctx context.Context, override *moneti
if err := c.applyObject(ctx, c.services.Namespace(skillCatalogNamespace), buildSkillCatalogService()); err != nil {
return err
}
// Headers Middleware must exist before the routes that reference it, or
// Traefik drops the routes for a dangling ExtensionRef.
if err := c.applyObject(ctx, c.middlewares.Namespace(skillCatalogNamespace), buildCatalogHeadersMiddleware()); err != nil {
return err
}
if err := c.applyObject(ctx, c.httpRoutes.Namespace(skillCatalogNamespace), buildSkillCatalogHTTPRoute()); err != nil {
return err
}
Expand Down
Loading
Loading