diff --git a/.devcontainer/Caddyfile b/.devcontainer/Caddyfile new file mode 100644 index 0000000..2075013 --- /dev/null +++ b/.devcontainer/Caddyfile @@ -0,0 +1,8 @@ +:9445 { + reverse_proxy https://localhost:9444 { + transport http { + tls_insecure_skip_verify + } + header_up Forwarded "host={http.request.header.X-Forwarded-Host};proto={http.request.header.X-Forwarded-Proto}" + } +} \ No newline at end of file diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7a1c5b0..a7ed422 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -41,7 +41,7 @@ RUN echo 'export PATH="$PATH:$EDA_PLAYGROUND_DIR/tools"' >> /etc/zsh/zshrc USER vscode -RUN git clone --depth 1 --branch v0.0.1 "https://github.com/$EDA_PLAYGROUND_REPO" $EDA_PLAYGROUND_DIR && cd $EDA_PLAYGROUND_DIR && \ +RUN git clone "https://github.com/$EDA_PLAYGROUND_REPO" $EDA_PLAYGROUND_DIR && cd $EDA_PLAYGROUND_DIR && \ make download-tools RUN curl -o $HOME/.bundle.yaml "https://raw.githubusercontent.com/nokia-eda/edaadm/refs/heads/main/bundles/eda-bundle-core-$EDA_VERSION.yaml" && \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index be36f06..f23860c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Nokia EDA in GitHub Codespaces", - "image": "ghcr.io/eda-labs/codespaces/base:main", + "image": "ghcr.io/eda-labs/codespaces/base:lb-test", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": { "version": "latest", diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index de91b6d..499951a 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -12,6 +12,5 @@ ensure-docker-is-ready k3d cluster create eda-demo \ --image rancher/k3s:v1.34.1-k3s1 \ --k3s-arg "--disable=traefik@server:*" \ - --k3s-arg "--disable=servicelb@server:*" \ --volume "$HOME/.images.txt:/opt/images.txt@server:*" \ - --no-lb + --port "9444:9444" diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 1182e8a..b74012a 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -9,4 +9,8 @@ ensure-docker-is-ready TOKEN=$($EDA_PLAYGROUND_DIR/tools/yq -o=json '.assets.registries[].auth' $HOME/.bundle.yaml | jq -r '(reduce range(.extraEncodeCount + 1) as $_ (.username; @base64d)) + ":" + (reduce range(.extraEncodeCount + 1) as $_ (.password; @base64d))') docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $(nproc) -I {} crictl pull --creds $TOKEN {}" -make -f Makefile -f $TRY_EDA_OVERRIDES_FILE try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file +make -f Makefile -f $TRY_EDA_OVERRIDES_FILE try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE + +kubectl apply -f ~/.playground/configs/kaelemtest.yaml -n eda-system + +docker run -d --name caddy --network host -v /workspaces/codespaces/.devcontainer/Caddyfile:/etc/caddy/Caddyfile caddy:alpine \ No newline at end of file