diff --git a/opsroot.json b/opsroot.json index ffff0706..a4231c89 100644 --- a/opsroot.json +++ b/opsroot.json @@ -9,7 +9,7 @@ "controller": "ghcr.io/nuvolaris/openwhisk-controller:3.1.0-mastrogpt.2402101445", "invoker": "ghcr.io/nuvolaris/openwhisk-invoker:3.1.0-mastrogpt.2402101445", "streamer": "registry.hub.docker.com/apache/openserverless-streamer:0.1.0-incubating.2505031325", - "systemapi": "registry.hub.docker.com/apache/openserverless-admin-api:0.1.0-incubating.2509280912" + "systemapi": "registry.hub.docker.com/apache/openserverless-admin-api:0.1.0-incubating.2512101357" } } } diff --git a/setup/docker/kind.yaml b/setup/docker/kind.yaml index 5f985718..cc9d71c7 100644 --- a/setup/docker/kind.yaml +++ b/setup/docker/kind.yaml @@ -20,13 +20,7 @@ apiVersion: kind.x-k8s.io/v1alpha4 containerdConfigPatches: - |- [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."127.0.0.1:32000"] - endpoint = ["http://127.0.0.1:32000"] - - [plugins."io.containerd.grpc.v1.cri".registry.configs] - [plugins."io.containerd.grpc.v1.cri".registry.configs."127.0.0.1:32000".tls] - insecure_skip_verify = true + config_path = "/etc/containerd/certs.d" nodes: - role: control-plane diff --git a/setup/docker/opsfile.yml b/setup/docker/opsfile.yml index 7a37e632..4850a1d0 100644 --- a/setup/docker/opsfile.yml +++ b/setup/docker/opsfile.yml @@ -64,11 +64,21 @@ tasks: cmds: - mkdir -p "$DATADIR" "$OPS_HOME/workspace" - envsubst -i kind.yaml -o _kind.yaml - - > - kind create cluster - --kubeconfig="$OPS_TMP/kubeconfig" - --wait=1m --name=nuvolaris + - > + kind create cluster + --kubeconfig="$OPS_TMP/kubeconfig" + --wait=1m --name=nuvolaris --config=_kind.yaml + - | + docker exec nuvolaris-control-plane mkdir -p /etc/containerd/certs.d/127.0.0.1:32000 + docker exec nuvolaris-control-plane sh -c 'cat > /etc/containerd/certs.d/127.0.0.1:32000/hosts.toml << EOF + server = "http://127.0.0.1:32000" + + [host."http://127.0.0.1:32000"] + capabilities = ["pull", "resolve", "push"] + skip_verify = true + EOF' + docker exec nuvolaris-control-plane systemctl restart containerd ingress: silent: true