Skip to content

Commit 941da3f

Browse files
authored
feat: integrate kubeflow-trainer with ambient (#293)
* feat: integrate kubeflow-trainer with ambient
1 parent 027abb2 commit 941da3f

File tree

10 files changed

+2016
-16
lines changed

10 files changed

+2016
-16
lines changed

.github/workflows/integrate.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ jobs:
5858
runs-on: ["self-hosted-linux-amd64-noble-xlarge"]
5959
strategy:
6060
matrix:
61-
tox-environments:
61+
tox-environment:
6262
- integration
63+
- integration-ambient
6364
- integration-with-profiles
6465
steps:
6566
- name: Check out code
@@ -119,7 +120,7 @@ jobs:
119120
sudo /snap/k8s/current/bin/ctr --namespace k8s.io image pull "${FINAL_IMAGE}" > /dev/null 2>&1
120121
sudo /snap/k8s/current/bin/ctr --namespace k8s.io image label "${FINAL_IMAGE}" io.cri-containerd.pinned=pinned
121122
done
122-
if: ${{ matrix.tox-environments == 'integration' }}
123+
if: ${{ matrix.tox-environment == 'integration' || matrix.tox-environment == 'integration-ambient' }}
123124

124125
- name: Fetch charm
125126
uses: actions/download-artifact@v5
@@ -131,9 +132,17 @@ jobs:
131132
id: charm-path
132133
run: echo "charm_path=$(find built/ -name '*.charm' -type f -print)" >> $GITHUB_OUTPUT
133134

135+
- name: Configure Cilium for Canonical K8s
136+
if: matrix.tox-environment == 'integration-ambient'
137+
run: |
138+
# Configure Cilium for Canonical K8s to work with Charmed Istio (Ambient mode)
139+
# See https://canonical-service-mesh-documentation.readthedocs-hosted.com/en/latest/how-to/use-charmed-istio-with-canonical-kubernetes/
140+
kubectl -n kube-system patch configmap cilium-config --type merge --patch '{"data":{"bpf-lb-sock-hostns-only":"true"}}'
141+
kubectl -n kube-system rollout restart daemonset cilium
142+
134143
- name: Run integration tests
135144
run: |
136-
tox -e ${{ matrix.tox-environments }} -- --model testing --charm-path="${{ steps.charm-path.outputs.charm_path }}"
145+
tox -e ${{ matrix.tox-environment }} -- --model testing --charm-path="${{ steps.charm-path.outputs.charm_path }}"
137146
138147
- name: Capture k8s resources on failure
139148
run: |

0 commit comments

Comments
 (0)