diff --git a/docs/source/deployment/index.rst b/docs/source/deployment/index.rst index 461ecb3734e..866393b24f5 100644 --- a/docs/source/deployment/index.rst +++ b/docs/source/deployment/index.rst @@ -380,7 +380,7 @@ Ingress is not working on Mac and Docker and the issue is `being tracked here 22/tcp, 127.0.0.1:57955->2376/tcp, 127.0.0.1:57957->5000/tcp, 127.0.0.1:57958->8443/tcp, 127.0.0.1:57956->32443/tcp minikube + 57f73851bf08 gcr.io/k8s-minikube/kicbase:v0.0.25 "/usr/local/bin/entr…" 46 hours ago Up About a minute 127.0.0.1:57954->22/tcp, 127.0.0.1:57955->2376/tcp, 127.0.0.1:57957->5800/tcp, 127.0.0.1:57958->8443/tcp, 127.0.0.1:57956->32443/tcp minikube diff --git a/notebooks/api/0.8/11-container-images-k8s.ipynb b/notebooks/api/0.8/11-container-images-k8s.ipynb index c28b0187567..6c57608e198 100644 --- a/notebooks/api/0.8/11-container-images-k8s.ipynb +++ b/notebooks/api/0.8/11-container-images-k8s.ipynb @@ -210,7 +210,7 @@ "metadata": {}, "outputs": [], "source": [ - "registry = \"k3d-registry.localhost:5000\"\n", + "registry = \"k3d-registry.localhost:5800\"\n", "repo = \"openmined/grid-backend\"\n", "\n", "res = requests.get(url=f\"http://{registry}/v2/{repo}/tags/list\")\n", diff --git a/packages/grid/helm/syft/templates/registry-service.yaml b/packages/grid/helm/syft/templates/registry-service.yaml index f96060e3a4d..284ef1f7292 100644 --- a/packages/grid/helm/syft/templates/registry-service.yaml +++ b/packages/grid/helm/syft/templates/registry-service.yaml @@ -11,7 +11,7 @@ spec: ports: - protocol: TCP port: 80 - targetPort: 5000 + targetPort: 5800 selector: app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/component: registry diff --git a/packages/grid/helm/syft/templates/registry-statefulset.yaml b/packages/grid/helm/syft/templates/registry-statefulset.yaml index c4fb60d474d..e5d6171b438 100644 --- a/packages/grid/helm/syft/templates/registry-statefulset.yaml +++ b/packages/grid/helm/syft/templates/registry-statefulset.yaml @@ -28,7 +28,7 @@ spec: - name: REGISTRY_STORAGE_DELETE_ENABLED value: "true" ports: - - containerPort: 5000 + - containerPort: 5800 volumeMounts: - mountPath: /var/lib/registry name: registry-data diff --git a/scripts/build_images.sh b/scripts/build_images.sh index 280ca544620..da58203e08b 100644 --- a/scripts/build_images.sh +++ b/scripts/build_images.sh @@ -1,6 +1,6 @@ #!/bin/bash -REGISTRY=${1:-"k3d-registry.localhost:5000"} +REGISTRY=${1:-"k3d-registry.localhost:5800"} TAG=${2:-"latest"} docker image build -f ./packages/grid/backend/backend.dockerfile --target backend -t $REGISTRY/openmined/grid-backend:$TAG ./packages diff --git a/tox.ini b/tox.ini index 0362e12bfcb..aa9f82abad7 100644 --- a/tox.ini +++ b/tox.ini @@ -693,7 +693,7 @@ commands = # Creating registory - bash -c 'k3d registry create registry.localhost --port 5000 -v `pwd`/k3d-registry:/var/lib/registry || true' + bash -c 'k3d registry create registry.localhost --port 5800 -v `pwd`/k3d-registry:/var/lib/registry || true' # Creating testgateway1 cluster on port 9081 bash -c 'NODE_NAME=testgateway1 NODE_PORT=9081 && \ @@ -707,7 +707,7 @@ commands = -p gateway \ --var NODE_NAME=$NODE_NAME \ --var TEST_MODE=1 \ - --var CONTAINER_REGISTRY=k3d-registry.localhost:5000 \ + --var CONTAINER_REGISTRY=k3d-registry.localhost:5800 \ --var NODE_TYPE=gateway \ deploy -b; \ do ((--r))||exit;echo "retrying" && sleep 20;done)' @@ -723,7 +723,7 @@ commands = devspace --no-warn --kube-context "k3d-$NODE_NAME" --namespace $NODE_NAME \ --var NODE_NAME=$NODE_NAME \ --var TEST_MODE=1 \ - --var CONTAINER_REGISTRY=k3d-registry.localhost:5000 \ + --var CONTAINER_REGISTRY=k3d-registry.localhost:5800 \ deploy -b; \ do ((--r))||exit;echo "retrying" && sleep 20;done)' @@ -869,14 +869,14 @@ commands = bash -c "k3d registry delete k3d-registry.localhost || true" - bash -c 'k3d registry create registry.localhost --port 5000 -v `pwd`/k3d-registry:/var/lib/registry || true' + bash -c 'k3d registry create registry.localhost --port 5800 -v `pwd`/k3d-registry:/var/lib/registry || true' bash -c 'NODE_NAME=syft NODE_PORT=8080 && \ k3d cluster create syft -p "$NODE_PORT:80@loadbalancer" --registry-use k3d-registry.localhost || true \ k3d cluster start syft' - ; skopeo list-tags --tls-verify=false docker://k3d-registry.localhost:5000/openmined/grid-backend - ; skopeo inspect --tls-verify=false docker://k3d-registry.localhost:5000/openmined/grid-backend:f1725f + ; skopeo list-tags --tls-verify=false docker://k3d-registry.localhost:5800/openmined/grid-backend + ; skopeo inspect --tls-verify=false docker://k3d-registry.localhost:5800/openmined/grid-backend:f1725f ; helm uninstall --kube-context k3d-syft --namespace syft syft ; helm install --kube-context k3d-syft --namespace syft syft ./syft ; k3d cluster create syft -p "8080:80@loadbalancer" && k3d cluster start syft @@ -932,13 +932,13 @@ allowlist_externals = sudo commands = ; create registry - bash -c 'k3d registry create registry.localhost --port 5000 -v $HOME/.k3d-registry:/var/lib/registry || true' + bash -c 'k3d registry create registry.localhost --port 5800 -v $HOME/.k3d-registry:/var/lib/registry || true' ; add patches to host bash -c 'if ! grep -q k3d-registry.localhost /etc/hosts; then sudo {envpython} scripts/patch_hosts.py --add-k3d-registry --fix-docker-hosts; fi' ; Fail this command if registry is not working - bash -c 'URL=http://k3d-registry.localhost:5000/v2/_catalog; curl -X GET $URL' + bash -c 'URL=http://k3d-registry.localhost:5800/v2/_catalog; curl -X GET $URL' [testenv:dev.k8s.start] description = Start local Kubernetes registry & cluster with k3d @@ -953,7 +953,7 @@ commands = tox -e dev.k8s.registry ; for NodePort to work add the following --> -p "NodePort:NodePort@loadbalancer" - bash -c 'k3d cluster create syft-dev -p "8080:80@loadbalancer" --registry-use k3d-registry.localhost:5000; \ + bash -c 'k3d cluster create syft-dev -p "8080:80@loadbalancer" --registry-use k3d-registry.localhost:5800; \ kubectl create namespace syft || true' ; dump cluster info @@ -968,7 +968,7 @@ allowlist_externals = bash commands = ; deploy syft helm charts - bash -c 'devspace deploy -b --kube-context k3d-syft-dev --namespace syft --var CONTAINER_REGISTRY=k3d-registry.localhost:5000' + bash -c 'devspace deploy -b --kube-context k3d-syft-dev --namespace syft --var CONTAINER_REGISTRY=k3d-registry.localhost:5800' [testenv:dev.k8s.hotreload] description = Start development with hot-reload in Kubernetes @@ -979,7 +979,7 @@ allowlist_externals = tox commands = ; deploy syft helm charts with hot-reload - bash -c 'devspace dev --kube-context k3d-syft-dev --namespace syft --var CONTAINER_REGISTRY=k3d-registry.localhost:5000' + bash -c 'devspace dev --kube-context k3d-syft-dev --namespace syft --var CONTAINER_REGISTRY=k3d-registry.localhost:5800' [testenv:dev.k8s.info] description = Gather info about the localKubernetes cluster @@ -1003,7 +1003,7 @@ allowlist_externals = bash commands = bash -c 'devspace purge --force-purge --kube-context k3d-syft-dev --namespace syft; sleep 3' - bash -c 'devspace cleanup images --kube-context k3d-syft-dev --namespace syft --var CONTAINER_REGISTRY=k3d-registry.localhost:5000 || true' + bash -c 'devspace cleanup images --kube-context k3d-syft-dev --namespace syft --var CONTAINER_REGISTRY=k3d-registry.localhost:5800 || true' bash -c 'kubectl config use-context k3d-syft-dev' bash -c 'kubectl delete all --all --namespace syft || true' bash -c 'kubectl delete pvc --all --namespace syft || true'