Cleanup

Makefile

@@ -3,6 +3,7 @@
 VERSION ?= v0.8.1
 IMG ?= docker.io/substratusai/controller-manager:${VERSION}
 IMG_GCPMANAGER ?= docker.io/substratusai/gcp-manager:${VERSION}
+IMG_SCI_KIND ?= docker.io/substratusai/sci-kind:${VERSION}
 
 # Set to false if you don't want GPU nodepools created
 ATTACH_GPU_NODEPOOLS=true
@@ -36,6 +37,7 @@ ifeq ($(UNAME_M),arm64)
 	SKAFFOLD_ARCH := arm64
 else
 	ifeq ($(UNAME_M),x86_64)
+		PROTOC_ARCH := aarch_64
 		SKAFFOLD_ARCH := amd64
 	else
 		PROTOC_ARCH := $(UNAME_M)
@@ -289,7 +291,9 @@ installation-scripts:
 installation-manifests: manifests kustomize
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	cd config/gcpmanager && $(KUSTOMIZE) edit set image gcp-manager=${IMG_GCPMANAGER}
-	$(KUSTOMIZE) build config/install-gcp > install/kubernetes/system.yaml
+	cd config/sci-kind && $(KUSTOMIZE) edit set image sci=${IMG_SCI_KIND}
+	# TODO: Fix in another PR:
+	#$(KUSTOMIZE) build config/install-gcp > install/kubernetes/system.yaml
 	$(KUSTOMIZE) build config/install-kind > install/kubernetes/kind/system.yaml
 
 .PHONY: prepare-release

config/install-kind/config.yaml

@@ -6,3 +6,4 @@ metadata:
 data:
   CLOUD: kind
   CLUSTER_NAME: substratus
+  PRINCIPAL: unused

config/manager/kustomization.yaml

@@ -6,6 +6,3 @@ images:
 - name: controller
   newName: docker.io/substratusai/controller-manager
   newTag: v0.8.1
-- name: gcp-manager
-  newName: docker.io/substratusai/gcp-manager
-  newTag: v0.6.5-alpha

config/sci-kind/kustomization.yaml

@@ -1,11 +1,11 @@
 resources:
-  - ../sci
+- ../sci
 patches:
-  - path: deployment_patch.yaml
-  - path: service_patch.yaml
+- path: deployment_patch.yaml
+- path: service_patch.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-  - name: sci
-    newName: docker.io/substratusai/sci-kind
-    newTag: v0.8.1
+- name: sci
+  newName: docker.io/substratusai/sci-kind
+  newTag: v0.8.1

examples/notebook/notebook.yaml

@@ -4,6 +4,8 @@ metadata:
   name: example
 spec:
   image: substratusai/base:latest
+  model:
+    name: facebook-opt-125m
   params:
     abc: xyz
     x: 123

install/kubernetes/kind/system.yaml

@@ -1458,7 +1458,7 @@ subjects:
 ---
 apiVersion: v1
 data:
-  allow-bundled-registry.sh: |
+  configure-cri.sh: |
     #!/usr/bin/env bash
 
     set -x
@@ -1484,17 +1484,19 @@ data:
     EOF
         fi
         nsenter --target 1 --mount bash -c "systemctl is-active --quiet containerd && echo 'Restarting containerd' && systemctl restart containerd"
+        # Wait for containerd to be ready so that skaffold doesn't fail.
+        nsenter --target 1 --mount bash -c "while ! ctr -n k8s.io containers ls; do sleep 1; done"
     fi
 kind: ConfigMap
 metadata:
-  name: allow-bundled-registry-script
+  name: configure-cri
   namespace: substratus
 ---
 apiVersion: v1
 data:
-  ARTIFACT_BUCKET_URL: tar:///bucket
   CLOUD: kind
   CLUSTER_NAME: substratus
+  PRINCIPAL: unused
 kind: ConfigMap
 metadata:
   name: system
@@ -1676,7 +1678,7 @@ spec:
         app: registry
     spec:
       containers:
-      - image: registry:2
+      - image: docker.io/library/registry:2
         name: registry
         ports:
         - containerPort: 5000
@@ -1740,27 +1742,27 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   labels:
-    app: allow-bundled-registry
-  name: allow-bundled-registry
+    app: configure-cri
+  name: configure-cri
   namespace: substratus
 spec:
   selector:
     matchLabels:
-      app: allow-bundled-registry
+      app: configure-cri
   template:
     metadata:
       labels:
-        app: allow-bundled-registry
+        app: configure-cri
     spec:
       containers:
       - image: gcr.io/google_containers/pause
         name: pause
       hostPID: true
       initContainers:
       - command:
-        - /scripts/allow-bundled-registry.sh
+        - /scripts/configure-cri.sh
         image: ubuntu:22.04
-        name: allow-bundled-registry
+        name: configure-cri
         securityContext:
           privileged: true
         volumeMounts:
@@ -1777,5 +1779,5 @@ spec:
         name: etc
       - configMap:
           defaultMode: 484
-          name: allow-bundled-registry-script
+          name: configure-cri
         name: scripts