From 1c7426b6e5df463aec865cec70d0c7a526d9852f Mon Sep 17 00:00:00 2001 From: louiseschmidtgen Date: Thu, 28 Nov 2024 16:30:10 +0100 Subject: [PATCH 1/5] update integration test --- .github/workflows/k8s-snap-integration.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/k8s-snap-integration.yaml b/.github/workflows/k8s-snap-integration.yaml index c23b0cbf..24383d1e 100644 --- a/.github/workflows/k8s-snap-integration.yaml +++ b/.github/workflows/k8s-snap-integration.yaml @@ -15,7 +15,7 @@ concurrency: jobs: build: name: K8s-snap Integration Test - runs-on: ubuntu-20.04 + runs-on: ["self-hosted", "Linux", "AMD64", "jammy", "large"] steps: - name: Checking out repo @@ -58,6 +58,11 @@ jobs: TEST_SUBSTRATE: lxd TEST_LXD_IMAGE: ubuntu:22.04 TEST_INSPECTION_REPORTS_DIR: ${{ github.workspace }}/inspection-reports + # Test the latest (up to) 6 releases for the flavour + TEST_VERSION_UPGRADE_CHANNELS: "recent 6 classic" + # Upgrading from 1.30 is not supported. + TEST_VERSION_UPGRADE_MIN_RELEASE: "1.31" + TEST_MIRROR_LIST: '[{"name": "ghcr.io", "port": 5000, "remote": "https://ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}, {"name": "docker.io", "port": 5001, "remote": "https://registry-1.docker.io", "username": "", "password": ""}, {"name": "rocks.canonical.com", "port": 5002, "remote": "https://rocks.canonical.com/cdk"}]' run: | git clone https://github.com/canonical/k8s-snap.git cd k8s-snap/tests/integration && sg lxd -c 'tox -e integration' From 07529f34f7f4a3ea04df267b009bccb17f5d8792 Mon Sep 17 00:00:00 2001 From: louiseschmidtgen Date: Thu, 19 Dec 2024 12:31:06 +0100 Subject: [PATCH 2/5] change base and add tag --- .github/workflows/k8s-snap-integration.yaml | 4 ++-- .github/workflows/performance.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/k8s-snap-integration.yaml b/.github/workflows/k8s-snap-integration.yaml index 24383d1e..c9014d97 100644 --- a/.github/workflows/k8s-snap-integration.yaml +++ b/.github/workflows/k8s-snap-integration.yaml @@ -15,7 +15,7 @@ concurrency: jobs: build: name: K8s-snap Integration Test - runs-on: ["self-hosted", "Linux", "AMD64", "jammy", "large"] + runs-on: self-hosted-linux-amd64-jammy-large steps: - name: Checking out repo @@ -65,7 +65,7 @@ jobs: TEST_MIRROR_LIST: '[{"name": "ghcr.io", "port": 5000, "remote": "https://ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}, {"name": "docker.io", "port": 5001, "remote": "https://registry-1.docker.io", "username": "", "password": ""}, {"name": "rocks.canonical.com", "port": 5002, "remote": "https://rocks.canonical.com/cdk"}]' run: | git clone https://github.com/canonical/k8s-snap.git - cd k8s-snap/tests/integration && sg lxd -c 'tox -e integration' + cd k8s-snap/tests/integration && sg lxd -c 'tox -e integration -- --tags up_to_nightly' - name: Prepare inspection reports if: failure() run: | diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index 5fc5f600..03deb22a 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -21,7 +21,7 @@ env: jobs: build: name: K8s-snap Performance Test - runs-on: ubuntu-20.04 + runs-on: self-hosted-linux-amd64-jammy-large steps: - name: Harden Runner uses: step-security/harden-runner@v2 From 3f5c0bf208dc1b9b9526d45a485cfcba1ea42546 Mon Sep 17 00:00:00 2001 From: louiseschmidtgen Date: Thu, 19 Dec 2024 14:08:22 +0100 Subject: [PATCH 3/5] nits --- .github/workflows/k8s-snap-integration.yaml | 2 +- .github/workflows/performance.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/k8s-snap-integration.yaml b/.github/workflows/k8s-snap-integration.yaml index c9014d97..adc00657 100644 --- a/.github/workflows/k8s-snap-integration.yaml +++ b/.github/workflows/k8s-snap-integration.yaml @@ -23,7 +23,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.10" - name: Install tox run: pip install tox - name: Install Go diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index 03deb22a..3220c4b4 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -42,7 +42,7 @@ jobs: go-version: "1.22" - name: Set-up R run: | - sudo apt install r-base + sudo apt-get install r-base -y sudo Rscript -e 'install.packages(c("ggplot2", "dplyr", "optparse"), repos="https://cloud.r-project.org")' - name: Install lxd run: | From 318f95663f85add318d836712bcf066acfd3196e Mon Sep 17 00:00:00 2001 From: louiseschmidtgen Date: Thu, 19 Dec 2024 14:32:58 +0100 Subject: [PATCH 4/5] ip-tables workaround --- .github/workflows/k8s-snap-integration.yaml | 7 ++ .github/workflows/performance.yaml | 11 +-- pkg/kine/server/mett.txt | 79 +++++++++++++++++++++ 3 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 pkg/kine/server/mett.txt diff --git a/.github/workflows/k8s-snap-integration.yaml b/.github/workflows/k8s-snap-integration.yaml index adc00657..96b4a917 100644 --- a/.github/workflows/k8s-snap-integration.yaml +++ b/.github/workflows/k8s-snap-integration.yaml @@ -39,6 +39,13 @@ jobs: sudo lxd init --auto sudo usermod --append --groups lxd $USER sg lxd -c 'lxc version' + # Docker sets iptables rules that interfere with LXD. + # https://documentation.ubuntu.com/lxd/en/latest/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-lxd-and-docker + - name: Apply Docker iptables workaround + shell: bash + run: | + sudo iptables -I DOCKER-USER -i lxdbr0 -j ACCEPT + sudo iptables -I DOCKER-USER -o lxdbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT - name: Build k8s-dqlite run: | make static diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index 3220c4b4..da26495f 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -50,12 +50,13 @@ jobs: sudo lxd init --auto sudo usermod --append --groups lxd $USER sg lxd -c 'lxc version' - - name: Ensure lxd network traffic flows by removing docker if installed + # Docker sets iptables rules that interfere with LXD. + # https://documentation.ubuntu.com/lxd/en/latest/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-lxd-and-docker + - name: Apply Docker iptables workaround + shell: bash run: | - if command -v docker >/dev/null 2>&1; then - echo "Docker is installed, purging it" - sudo apt-get purge -y docker-engine docker docker.io docker-ce docker-ce-cli containerd runc - fi + sudo iptables -I DOCKER-USER -i lxdbr0 -j ACCEPT + sudo iptables -I DOCKER-USER -o lxdbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT - name: Download latest k8s-snap run: | sudo snap download k8s --channel=latest/edge --basename k8s diff --git a/pkg/kine/server/mett.txt b/pkg/kine/server/mett.txt new file mode 100644 index 00000000..f4f3bd8c --- /dev/null +++ b/pkg/kine/server/mett.txt @@ -0,0 +1,79 @@ + + +- initial brainstorm workshop + +OPEA 30 minutes intro, micro services spin up agents show architecture. + +graph, databases + +afterwards canonical part of the workshop + +having the deployment on microk8s, +neo4j, vanilla example but extend it to the edge + +infrastructure provided no problem + + +90 minutes + +30/40 minutes + + +environment, instructions, EKS, + + +cloud nighttag intel developer cloud +ipcs there +aipc + +access to the environment + +idc account + + +hardware: aipc + +nvidia gpu +gaudi + +run RAG with opensearch + +cpu only with gpu its fast without its slow like 1minute per response + + +run RAG architecture + + +access gpu + +pvcs or gaudis checking what arch we have + +run RAG on gaudi accelerator + +on cloud they dont have nvidia + +what generation zion + +24.04 ubuntu 16 cores 1 soket + +aipc, gpu +training on dater center on the edge + +probably nothing on gaudi more on zion + + +share overall architecture + +chatqnA + +opensearch, + +graph rag deployed in our environment + + +OPEA - OpenPlatform for Enterprise AI (linux foundation project) +--> RAG - Retrieval Augmented Generation + +ChatQnA - Chat Question and Answer bot + + From 3a597ee10350546b5cbf4f4f7e71e1ab4064aae4 Mon Sep 17 00:00:00 2001 From: louiseschmidtgen Date: Thu, 19 Dec 2024 15:06:42 +0100 Subject: [PATCH 5/5] rm mirror --- .github/workflows/k8s-snap-integration.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/k8s-snap-integration.yaml b/.github/workflows/k8s-snap-integration.yaml index 96b4a917..1fafe7c6 100644 --- a/.github/workflows/k8s-snap-integration.yaml +++ b/.github/workflows/k8s-snap-integration.yaml @@ -69,7 +69,6 @@ jobs: TEST_VERSION_UPGRADE_CHANNELS: "recent 6 classic" # Upgrading from 1.30 is not supported. TEST_VERSION_UPGRADE_MIN_RELEASE: "1.31" - TEST_MIRROR_LIST: '[{"name": "ghcr.io", "port": 5000, "remote": "https://ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}, {"name": "docker.io", "port": 5001, "remote": "https://registry-1.docker.io", "username": "", "password": ""}, {"name": "rocks.canonical.com", "port": 5002, "remote": "https://rocks.canonical.com/cdk"}]' run: | git clone https://github.com/canonical/k8s-snap.git cd k8s-snap/tests/integration && sg lxd -c 'tox -e integration -- --tags up_to_nightly'