Compare commits

...
40 Commits
Author SHA1 Message Date
adrien 28cd5c00aa Merge pull request 'Fixs' (#5) from test into main
Reviewed-on: #5
2026-08-17 10:08:17 +00:00
Adrien Bouvais 9ca95ca252 Fix minio setup
Build and Push Docker Images / build-and-push (pull_request) Successful in 27s
Validate Kubernetes & YAML / validate-all (pull_request) Successful in 36s
2026-08-17 12:06:22 +02:00
Adrien Bouvais 9c7422f2f2 Added openssl to minio setup runner 2026-08-17 11:55:11 +02:00
Adrien Bouvais 09f48bf0e3 Added tenant-c 2026-08-17 11:48:45 +02:00
Adrien Bouvais 6a5bd13a13 Added credentials to docker image pull 2026-08-17 11:42:24 +02:00
adrien f0821d2cfe Merge pull request 'Changed minio runner to use custom image' (#4) from test into main
Reviewed-on: #4
2026-08-17 09:39:51 +00:00
Adrien Bouvais b470314318 Changed minio runner to use custom image
Build and Push Docker Images / build-and-push (pull_request) Successful in 24s
Validate Kubernetes & YAML / validate-all (pull_request) Successful in 37s
2026-08-17 11:39:18 +02:00
adrien f459b11e8b Merge pull request 'Stop propagating minio admin credentials to each tenants' (#3) from test into main
Reviewed-on: #3
2026-08-17 09:29:37 +00:00
Adrien Bouvais 174c5faf6b Stop propagating minio admin credentials to each tenants
Build and Push Docker Images / build-and-push (pull_request) Successful in 22s
Validate Kubernetes & YAML / validate-all (pull_request) Successful in 36s
2026-08-17 11:29:00 +02:00
adrien b9eeab3e57 Merge pull request 'Synthax on README' (#2) from test into main
Reviewed-on: #2
2026-08-17 09:06:15 +00:00
Adrien Bouvais 32cffaad39 Synthax on README
Build and Push Docker Images / build-and-push (pull_request) Successful in 22s
Validate Kubernetes & YAML / validate-all (pull_request) Successful in 40s
2026-08-17 11:05:01 +02:00
adrien f99ac908dc Merge pull request 'Reduce tenant-b resources' (#1) from test into main
Reviewed-on: #1
2026-08-17 08:53:31 +00:00
Adrien Bouvais 7e1fa9c994 Reduce tenant-b resources
Build and Push Docker Images / build-and-push (pull_request) Successful in 20s
Validate Kubernetes & YAML / validate-all (pull_request) Successful in 33s
2026-08-17 10:51:47 +02:00
Adrien Bouvais 51250f8dd2 Better README 2026-08-17 10:48:16 +02:00
Adrien Bouvais 2f29eaa8b5 Enforce tenant-* naming 2026-08-17 10:35:16 +02:00
Adrien Bouvais b8461ac4e6 Test 2026-08-17 10:23:28 +02:00
Adrien Bouvais ea22a93006 Enforced PR on main 2026-08-17 10:22:24 +02:00
Adrien Bouvais a2f8e05c7e Removed chart val, already validate with tenant config
Build and Push Docker Images / build-and-push (push) Successful in 22s
Validate Kubernetes & YAML / validate-all (push) Successful in 35s
2026-08-17 09:38:20 +02:00
Adrien Bouvais 68b65861ac Back to normal bin
Build and Push Docker Images / build-and-push (push) Successful in 25s
Validate Kubernetes & YAML / validate-all (push) Failing after 34s
2026-08-17 09:35:15 +02:00
Adrien Bouvais 6ff75ad926 Fixs
Build and Push Docker Images / build-and-push (push) Failing after 38s
Validate Kubernetes & YAML / validate-all (push) Failing after 37s
2026-08-17 09:30:08 +02:00
Adrien Bouvais 0b87f5ad97 Fix actions
Build and Push Docker Images / build-and-push (push) Failing after 42s
Validate Kubernetes & YAML / validate-all (push) Failing after 40s
2026-08-17 09:25:26 +02:00
Adrien Bouvais 287725306a Try trufflehog action
Build and Push Docker Images / build-and-push (push) Failing after 38s
Validate Kubernetes & YAML / validate-all (push) Failing after 36s
2026-08-17 09:13:08 +02:00
Adrien Bouvais c6549f8204 Added valdiate action
Build and Push Docker Images / build-and-push (push) Successful in 17s
Validate Kubernetes & YAML / validate-all (push) Failing after 35s
2026-08-17 09:06:07 +02:00
Adrien Bouvais 0d163bef84 Added network policy
Build and Push Docker Images / build-and-push (push) Successful in 22s
2026-08-16 15:18:40 +02:00
Adrien Bouvais 7215a74630 Removed TODO
Build and Push Docker Images / build-and-push (push) Successful in 24s
2026-08-16 15:12:04 +02:00
Adrien Bouvais a380bae6a2 Hardcoded registry url
Build and Push Docker Images / build-and-push (push) Successful in 21s
2026-08-16 15:11:41 +02:00
Adrien Bouvais c545ff27d6 Fix
Build and Push Docker Images / build-and-push (push) Successful in 21s
2026-08-16 15:08:16 +02:00
Adrien Bouvais a6feecb782 Push both images at the end to prevent pushing base and jupyter fail
Build and Push Docker Images / build-and-push (push) Failing after 44s
2026-08-16 15:02:07 +02:00
Adrien Bouvais d0e48b5891 Changed gitleaks to trufflehog
Build and Push Docker Images / build-and-push (push) Failing after 1m36s
2026-08-16 15:00:22 +02:00
Adrien Bouvais e8a2361475 Synthax
Build and Push Docker Images / build-and-push (push) Failing after 17s
2026-08-16 14:57:06 +02:00
Adrien Bouvais 10165178e8 Test 2026-08-16 14:56:40 +02:00
Adrien Bouvais 25f63813a2 Stop using dokcer for gitleaks
Build and Push Docker Images / build-and-push (push) Failing after 10s
2026-08-16 14:54:11 +02:00
Adrien Bouvais 07064909e1 Try
Build and Push Docker Images / build-and-push (push) Successful in 22s
2026-08-16 14:51:30 +02:00
Adrien Bouvais f1ec84d23c Change path
Build and Push Docker Images / build-and-push (push) Successful in 21s
2026-08-16 14:49:23 +02:00
Adrien Bouvais b28a1e130f Fix gitleaks
Build and Push Docker Images / build-and-push (push) Failing after 17s
2026-08-16 14:48:22 +02:00
Adrien Bouvais 6a8d58cce9 Fix
Build and Push Docker Images / build-and-push (push) Failing after 28s
2026-08-16 14:46:52 +02:00
Adrien Bouvais 2261d7ec0d Fix
Build and Push Docker Images / build-and-push (push) Failing after 18s
2026-08-16 14:42:07 +02:00
Adrien Bouvais edee209485 Update version action
Build and Push Docker Images / build-and-push (push) Failing after 33s
2026-08-16 14:40:04 +02:00
Adrien Bouvais b538c4b696 Added gitleak action
Build and Push Docker Images / build-and-push (push) Failing after 23s
2026-08-16 14:38:17 +02:00
Adrien Bouvais 60cd7ef805 Change image tag 2026-08-16 13:53:59 +02:00
15 changed files with 495 additions and 140 deletions
+4 -7
View File
@@ -16,7 +16,7 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v6
- name: Log in to the Container registry - name: Log in to the Container registry
run: | run: |
@@ -45,11 +45,6 @@ jobs:
docker tag ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:${{ github.ref_name }} \ docker tag ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:${{ github.ref_name }} \
${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest
- name: Push Base image
run: |
docker push ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:${{ github.ref_name }}
docker push ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest
# --- 2. BUILD & TEST JUPYTER IMAGE --- # --- 2. BUILD & TEST JUPYTER IMAGE ---
- name: Build Jupyter image - name: Build Jupyter image
run: | run: |
@@ -72,7 +67,9 @@ jobs:
docker tag ${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:${{ github.ref_name }} \ docker tag ${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:${{ github.ref_name }} \
${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:latest ${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:latest
- name: Push Jupyter image - name: Push images
run: | run: |
docker push ${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:${{ github.ref_name }} docker push ${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:${{ github.ref_name }}
docker push ${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:latest docker push ${{ env.REGISTRY }}/${{ env.JUPYTER_IMAGE_NAME }}:latest
docker push ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:${{ github.ref_name }}
docker push ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest
+21
View File
@@ -0,0 +1,21 @@
name: Build and Push Docker Images
on:
pull_request:
branches:
- main
jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Run TruffleHog CLI
run: |
curl -sSfL https://raw.githubusercontent.com/trufflesecurity/trufflehog/main/scripts/install.sh | sudo sh -s -- -b /usr/local/bin
trufflehog git file://$(pwd) --results=verified
+43
View File
@@ -0,0 +1,43 @@
name: Validate Kubernetes & YAML
on:
pull_request:
branches:
- main
jobs:
validate-all:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Install Validation Tools
run: |
# Install yamllint
sudo apt-get update && sudo apt-get install -y yamllint
# Install Helm
curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
# Install Kubeconform
wget https://github.com/yannh/kubeconform/releases/download/v0.6.4/kubeconform-linux-amd64.tar.gz
tar xf kubeconform-linux-amd64.tar.gz
sudo mv kubeconform /usr/local/bin/
- name: Lint Pure YAML Files
run: yamllint ./tenants
- name: Validate Tenant Configurations against Chart
run: |
for tenant_dir in tenants/*; do
if [ -d "$tenant_dir" ]; then
tenant_name=$(basename "$tenant_dir")
echo "------------------------------------------------"
echo "Validating rendered output for: $tenant_name"
echo "------------------------------------------------"
helm template "$tenant_name" charts/tenant/ -f "$tenant_dir/config.yaml" | \
kubeconform -strict -summary -schema-location default
fi
done
+267 -54
View File
@@ -1,81 +1,294 @@
# 0. Introduction # Technical Assessment: Multi-Tenant Jupyter Platform
- Did it on a macbook air as I am away from my Linux workstation at home ## 1. Introduction & Architecture
- I will use some of my selfhosted services in examples, e.g. `registry.bouvais.lu` for docker registry and `git.bouvais.lu` for gitea.
# 1. Create env This repository contains the declarative configuration, infrastructure code,
and CI/CD pipelines to deploy and manage a multi-tenant Jupyter platform on Kubernetes.
First let's install everything that I will use using `brew`. The goal is to provide isolated workspaces for different teams (tenants) using a GitOps methodology,
meaning no manual manifest duplication or imperative `kubectl` commands are required to onboard new projects.
### High-Level Architecture
The solution relies on **Argo CD** for GitOps synchronization, **Helm** for templating
the tenant resources, and a shared **MinIO** instance for S3-compatible storage.
```mermaid
graph TD
subgraph Git Repository
A[GitOps: tenants/] -->|Contains| B(tenant-a/config.yaml)
A -->|Contains| C(tenant-b/config.yaml)
end
subgraph Kubernetes Cluster
D[Argo CD] -->|Scans Git & Generates| E{ApplicationSet}
E -->|Deploys via Helm| F[Namespace: tenant-a]
E -->|Deploys via Helm| G[Namespace: tenant-b]
subgraph argo [Namespace: argocd]
D(Argo CD)
E(ApplicationSet)
end
subgraph F [Namespace: tenant-a]
F1(Jupyter Pod)
F2(ServiceAccount)
F3(NetworkPolicy)
F4(MinIO Setup Job)
end
subgraph MinIO [Namespace: minio]
M1[(Shared MinIO S3)]
end
end
B -.-> D
C -.-> D
F4 -->|Creates Buckets & Credentials| M1
F1 -->|Reads/Writes| M1
```
brew install docker
``` ```
# 2. Images ---
To created the needed dependency, I did a simple 2 images base + jupyter. ## 2. Requirements
The first image is a minimal python slim. I then add some
### 2.1. Base This section details how the technical choices address the specific requirements of the assessment.
```images/base/dockerfile ### 2.1 Multi-Tenant Management & GitOps
FROM python:3.12-slim-bookworm AS base
LABEL org.opencontainers.image.title="tenant-base" \ * **Zero Duplication:** Tenant configurations are fully abstracted. The
org.opencontainers.image.description="Hardened base image for tenant workspaces" \ `charts/tenant` Helm chart acts as the single source of truth for the Kubernetes manifests.
org.opencontainers.image.source="https://git.bouvais.lu/adrien/" * **Declarative Onboarding:** Adding a new workspace simply requires creating a
new folder named `tenant-*` with a `config.yaml` file inside `tenants/`.
* **Argo CD ApplicationSet:** A root ApplicationSet monitors the Git repository
path `tenants/*/config.yaml`. Upon detecting a new folder, it automatically
generates an Argo CD `Application`, pulls the Helm chart, injects the specific
values, and provisions the new namespace.
# System deps only — keep this layer stable so it's rarely rebuilt ### 2.2 Kubernetes & S3 Isolation
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
curl \
tini \
&& rm -rf /var/lib/apt/lists/*
# Non-root user, fixed UID/GID for predictable K8s securityContext * **Namespace & Identity:** Each tenant is strictly deployed in its own namespace
RUN groupadd --gid 1000 appuser \ (`tenant-a`, `tenant-b`) and runs under a dedicated Kubernetes `ServiceAccount`.
&& useradd --uid 1000 --gid appuser --shell /bin/bash --create-home appuser * **Network Security:** A `NetworkPolicy` is deployed within each tenant namespace
to restrict ingress/egress traffic. The Jupyter notebook can only communicate
with necessary services (like MinIO) and the internet, preventing cross-namespace communication.
* **Automated & Isolated S3 Setup:** Instead of sharing credentials, a one-off Kubernetes `Job`
runs during the Helm deployment for each tenant. This job connects to the MinIO admin API,
creates a reference bucket (Read-Only), a work bucket (Read/Write), and generates
**dedicated, scoped S3 credentials**. These credentials are saved as a Kubernetes
Secret locally in the tenant's namespace.
* **Security Context:** The Docker images use the `tini` init system and execute
application containers as a non-root user.
WORKDIR /home/appuser ### 2.3 Container Images & Dependencies
USER appuser
ENTRYPOINT ["tini", "--"] * **Base & Dependent Images:** The project uses two custom images located in
``` `images/`. The `tenant/base` image contains the core OS (`python:3.12-slim-bookworm`),
security contexts, and user setups. The `tenant/jupyter` image builds on top
of the base image and installs the application requirements.
* **No Hardcoded Secrets:** Images are completely stateless and free of secrets. They
rely solely on environment variables injected at runtime via Kubernetes Secrets.
Then build and push it to the registry ### 2.4 CI/CD & Secret Management
* **Gitea Actions Pipeline:** The CI/CD workflow (`.gitea/workflows/`) automatically
manages the image lifecycle and code quality.
* **Validation:** Helm charts and tenant configs are validated before deployment.
* **Ordered Build Strategy:** The pipeline respects the image hierarchy. It builds the base image first,
then uses it to build the Jupyter image. Triggered on `*.*.*` tags, it pushes the versioned
artifacts to a private Docker registry.
* **Testing:** Basic testing is executed during the CI phase to ensure the Jupyter environment boots correctly.
* **Branch Protection & PR Flow:** The `main` branch is protected against direct pushes.
All infrastructure and application changes must be proposed via Pull Requests.
The CI pipelines act as mandatory status checks, ensuring that no code can be merged
into `main` unless the configurations are validated, no secrets are leaked, and all tests pass successfully.
* **Secret Scanning:** `TruffleHog` runs as a CI step to scan the repository and prevent any accidental commit of sensitive information (AWS keys, passwords).
* **Secret Injection:** Admin credentials (Docker registry, MinIO admin) are injected into the Argo CD
namespace and propagated to tenant namespaces dynamically matching `tenant-[a-z0-9-]+`
using the `Reflector` Kubernetes addon.
---
## 3. Deployment Guide (Quickstart)
This section provides the step-by-step instructions to set up the local Kubernetes cluster and
bootstrap the GitOps environment.
*Note: You will not be able to use this repo directly as it require credentials for
my selfhosted gitea and docker registry.*
### 3.1 Prerequisites
Ensure the following tools are installed on your machine (e.g., via Homebrew on macOS):
```bash
brew install docker kind kubectl helm argocd k9s
```
docker build -t registry.bouvais.lu/tenant-base:1.0.0 images/base
docker push registry.bouvais.lu/tenant-base:1.0.0
``` ```
### 2.2. Jupyter ### 3.2 Cluster Creation
Now I dp the same for a simple jupyter image. Spin up a local Kubernetes cluster using `kind`:
```bash
kind create cluster --name ctie-exercice
kubectl cluster-info
``` ```
ARG BASE_IMAGE=registry.bouvais.lu/tenant-base:1.0.0
FROM ${BASE_IMAGE}
LABEL org.opencontainers.image.title="tenant-jupyter" \ ### 3.3 Install Cluster Dependencies (Argo CD & Reflector)
org.opencontainers.image.description="JupyterLab image built on tenant-base" \
org.opencontainers.image.base.name="${BASE_IMAGE}"
USER root Install the Argo CD CRDs, the Reflector addon (used to propagate secrets to dynamically created tenant namespaces),
COPY --chown=appuser:appuser requirements.txt /tmp/requirements.txt and the Argo CD engine itself:
RUN pip install --no-cache-dir -r /tmp/requirements.txt \
&& rm /tmp/requirements.txt
# No secrets baked in — S3 creds come from a mounted K8s Secret / env at runtime ```bash
USER appuser # Reflector & Argo CD CRDs
WORKDIR /home/appuser/work kubectl apply --server-side -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=stable"
kubectl apply -f https://github.com/emberstack/kubernetes-reflector/releases/latest/download/reflector.yaml
EXPOSE 8888 # Argo CD in its dedicated namespace
kubectl create ns argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
CMD ["jupyter", "lab", \
"--ip=0.0.0.0", \
"--port=8888", \
"--no-browser", \
"--ServerApp.token=", \
"--ServerApp.allow_remote_access=True"]
``` ```
### 3.4 Install MinIO (Shared Storage)
Deploy the shared MinIO instance which will act as the S3 backend for all tenants:
```bash
kubectl create ns minio
kubectl apply -f minio/manifests.yaml
# Verify MinIO is running
kubectl -n minio get pods -w
```
### 3.5 Global Secrets Setup
Before launching the GitOps automated deployments, we need to provide the base credentials.
Reflector will automatically replicate these to any namespace matching `tenant-[a-z0-9-]+`.
**1. Docker Registry Credentials:**
```bash
kubectl create secret docker-registry registry-credentials \
--docker-server=registry.bouvais.lu \
--docker-username="<YOUR_USER>" \
--docker-password="<YOUR_TOKEN>" \
--namespace=argocd
kubectl annotate secret registry-credentials -n argocd --overwrite \
reflector.v1.k8s.emberstack.com/reflection-allowed="true" \
reflector.v1.k8s.emberstack.com/reflection-auto-enabled="true" \
reflector.v1.k8s.emberstack.com/reflection-auto-namespaces="tenant-[a-z0-9-]+" \
reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces="tenant-[a-z0-9-]+"
```
**2. MinIO Admin Credentials:**
```bash
kubectl create secret generic minio-admin-credentials \
--from-literal=MINIO_ROOT_USER=admin \
--from-literal=MINIO_ROOT_PASSWORD=password123 \
-n argocd
kubectl annotate secret minio-admin-credentials -n argocd --overwrite \
reflector.v1.k8s.emberstack.com/reflection-allowed="true" \
reflector.v1.k8s.emberstack.com/reflection-auto-enabled="true" \
reflector.v1.k8s.emberstack.com/reflection-auto-namespaces="tenant-[a-z0-9-]+" \
reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces="tenant-[a-z0-9-]+"
```
### 3.6 GitOps Bootstrap
Finally, apply the root Argo CD ApplicationSet. This will instruct Argo CD to monitor
the repository and automatically provision `tenant-a` and `tenant-b`.
```bash
kubectl apply -f gitops/bootstrap/root-app.yaml
```
*(Optional)* You can access the Argo CD UI to watch the automated deployment:
```bash
kubectl -n argocd get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d; echo
kubectl -n argocd port-forward svc/argocd-server 8080:443
# Access at https://localhost:8080 using username 'admin'
```
---
## 4. Tests and Validation
Once the tenants are fully deployed by Argo CD, we can verify that data access and workspace
isolation behave exactly as expected.
### 4.1 Accessing the Jupyter Workspace
Because Ingress routing is out-of-scope for this exercise, we will connect to `tenant-a`'s
notebook using a manual port-forward:
```bash
kubectl port-forward -n tenant-a deployment/jupyter 8888:8888
```
Open a browser and navigate to `http://localhost:8888`.
### 4.2 Running the Isolation Tests
Inside the JupyterLab interface, open a terminal or a notebook and run the provided Python
validation script (`test_buckets.py`). The output will look like this:
```text
SUCCESS: List items in ref bucket: 1 hello tenant-a
SUCCESS: Write to reference bucket blocked: An error occurred (AccessDenied) when calling the PutObject operation: Access Denied.
SUCCESS: Read back from work bucket: hello tenant
SUCCESS: Access to tenant-b blocked: An error occurred (AccessDenied) when calling the ListObjectsV2 operation: Access Denied.
```
**What this proves:**
1. **Read-only Reference:** The tenant can read the reference bucket, but writing to
it is successfully blocked by MinIO policies.
2. **Read/Write Work Bucket:** The tenant has full capability in its designated working bucket.
3. **Strict Isolation:** Any attempt to list, read, or write to `tenant-b`'s buckets from
`tenant-a`'s credentials results in an `AccessDenied` error.
---
## 5. Teardown
To clean up your local environment, you simply need to delete the `kind` cluster.
This will remove all associated resources, namespaces, and volumes.
```bash
kind delete cluster --name ctie-exercice
```
---
## 6. Future Improvements
While this setup successfully demonstrates a GitOps-driven multi-tenant architecture, deploying this to a production environment would require several additions:
* **Ingress & TLS:** Replacing manual `kubectl port-forward` commands with a proper Ingress Controller
(e.g., NGINX or Traefik) and integrating `cert-manager` for automated SSL/TLS certificates.
* **Storage Quotas:** Implementing strict S3 storage limits (quotas) on the work buckets to prevent
a single tenant from exhausting shared storage resources.
* **Kubernetes Resource Limits:** Adding Kubernetes `ResourceQuotas` per tenant namespace and
`LimitRanges` to cap CPU, Memory, and optionally GPU consumption per Jupyter pod.
* **SSO / Authentication:** Replacing token-based Jupyter authentication with OIDC integration
(e.g., Keycloak, Dex, or Azure AD) for seamless enterprise user login.
* **Automated DNS:** Integrating `ExternalDNS` to automatically map newly created tenant
workspaces to human-readable URLs (e.g., `tenant-a.jupyter.internal.domain`).
+1 -3
View File
@@ -6,8 +6,6 @@ metadata:
labels: labels:
app: jupyter app: jupyter
tenant: 'tenant-{{.Values.name}}' tenant: 'tenant-{{.Values.name}}'
annotations:
argocd.argoproj.io/sync-wave: "1"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@@ -25,7 +23,7 @@ spec:
- name: registry-credentials - name: registry-credentials
containers: containers:
- name: jupyter - name: jupyter
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "registry.bouvais.lu/tenant/jupyter:{{ .Values.version }}"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
envFrom: envFrom:
- secretRef: - secretRef:
+54 -65
View File
@@ -2,99 +2,88 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: 'tenant-{{ .Values.name }}-minio-setup' name: 'tenant-{{ .Values.name }}-minio-setup'
namespace: {{ .Release.Namespace }} namespace: minio
annotations: annotations:
argocd.argoproj.io/sync-wave: "-1"
argocd.argoproj.io/hook: Sync argocd.argoproj.io/hook: Sync
argocd.argoproj.io/hook-delete-policy: HookSucceeded argocd.argoproj.io/hook-delete-policy: HookSucceeded
spec: spec:
ttlSecondsAfterFinished: 100 ttlSecondsAfterFinished: 100
template: template:
spec: spec:
serviceAccountName: minio-provisioner
restartPolicy: OnFailure restartPolicy: OnFailure
imagePullSecrets:
- name: registry-credentials
containers: containers:
- name: mc - name: setup
image: minio/mc:RELEASE.2024-03-03T00-13-08Z image: registry.bouvais.lu/minio-runner:1.0.0
env: command: ["/bin/sh", "-c"]
# 1. MinIO Admin Credentials (Replicated from argocd namespace) args:
- name: MINIO_ADMIN_USER
valueFrom:
secretKeyRef:
name: minio-admin-credentials
key: MINIO_ROOT_USER
- name: MINIO_ADMIN_PASS
valueFrom:
secretKeyRef:
name: minio-admin-credentials
key: MINIO_ROOT_PASSWORD
# 2. Randomly Generated Tenant Credentials
- name: TENANT_USER
valueFrom:
secretKeyRef:
name: s3-credentials
key: MINIO_ACCESS_KEY_ID
- name: TENANT_PASS
valueFrom:
secretKeyRef:
name: s3-credentials
key: MINIO_SECRET_ACCESS_KEY
- name: BUCKET_REF
valueFrom:
secretKeyRef:
name: s3-credentials
key: BUCKET_REF
- name: BUCKET_WORK
valueFrom:
secretKeyRef:
name: s3-credentials
key: BUCKET_WORK
command:
- /bin/sh
- -c
- | - |
# Fail immediately if any command fails set -e
set -e
# Connect to MinIO using quotes to protect special characters in passwords # Generate password
mc alias set minioadmin http://minio.minio.svc.cluster.local:9000 "$MINIO_ADMIN_USER" "$MINIO_ADMIN_PASS" SCOPED_SECRET=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 32)
# Configure MinIO alias
mc alias set local http://minio.minio.svc:9000 \
"$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD"
# Create buckets # Create buckets
mc mb --ignore-existing minioadmin/$BUCKET_REF mc mb -p local/{{ .Values.name }}-ref local/{{ .Values.name }}-work
mc mb --ignore-existing minioadmin/$BUCKET_WORK
echo "hello tenant-{{ .Values.name }}" | mc pipe minioadmin/$BUCKET_REF/hello.txt # Create user with generated credentials
mc admin user add local {{ .Values.name }}-user "$SCOPED_SECRET"
# Create tenant user (REMOVED || true) # Inline policy generation to avoid missing mount issues
mc admin user add minioadmin "$TENANT_USER" "$TENANT_PASS"
# Apply IAM isolation policy
cat <<EOF > /tmp/policy.json cat <<EOF > /tmp/policy.json
{ {
"Version": "2012-10-17", "Version": "2012-10-17",
"Statement": [ "Statement": [
{ {
"Sid": "ReadOnlyRefBucket",
"Effect": "Allow", "Effect": "Allow",
"Action": ["s3:GetBucketLocation", "s3:ListBucket"], "Action": [
"s3:GetBucketLocation",
"s3:ListBucket",
"s3:GetObject"
],
"Resource": [ "Resource": [
"arn:aws:s3:::$BUCKET_REF", "arn:aws:s3:::{{ .Values.name }}-ref",
"arn:aws:s3:::$BUCKET_WORK" "arn:aws:s3:::{{ .Values.name }}-ref/*"
] ]
}, },
{ {
"Sid": "ReadWriteWorkBucket",
"Effect": "Allow", "Effect": "Allow",
"Action": ["s3:GetObject"], "Action": [
"Resource": ["arn:aws:s3:::$BUCKET_REF/*"] "s3:*"
}, ],
{ "Resource": [
"Effect": "Allow", "arn:aws:s3:::{{ .Values.name }}-work",
"Action": ["s3:*"], "arn:aws:s3:::{{ .Values.name }}-work/*"
"Resource": ["arn:aws:s3:::$BUCKET_WORK/*"] ]
} }
] ]
} }
EOF EOF
# Apply policy and attach to user
mc admin policy create local {{ .Values.name }}-policy /tmp/policy.json
mc admin policy attach local {{ .Values.name }}-policy --user {{ .Values.name }}-user
mc admin policy create minioadmin tenant-{{ .Values.name }}-policy /tmp/policy.json || mc admin policy update minioadmin tenant-{{ .Values.name }}-policy /tmp/policy.json # Create target secret with matching credentials
# Good enough for now, would need better error handeling kubectl create secret generic {{ .Values.name }}-s3-credentials \
mc admin policy attach minioadmin tenant-{{ .Values.name }}-policy --user="$TENANT_USER" || echo "Policy already attached, skipping." --from-literal=AWS_ACCESS_KEY_ID={{ .Values.name }}-user \
echo "MinIO setup completed for tenant-{{ .Values.name }}" --from-literal=AWS_SECRET_ACCESS_KEY="$SCOPED_SECRET" \
-n minio --dry-run=client -o yaml | kubectl apply -f -
# Annotate for Emberstack Reflector
kubectl annotate secret {{ .Values.name }}-s3-credentials -n minio --overwrite \
reflector.v1.k8s.emberstack.com/reflection-allowed="true" \
reflector.v1.k8s.emberstack.com/reflection-auto-enabled="true" \
reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces="tenant-{{ .Values.name }}" \
reflector.v1.k8s.emberstack.com/reflection-auto-namespaces="tenant-{{ .Values.name }}"
envFrom:
- secretRef:
name: minio-admin-credentials
@@ -0,0 +1,44 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: jupyter-netpol
namespace: {{ .Release.Namespace }}
labels:
app: jupyter
tenant: 'tenant-{{ .Values.name }}'
spec:
podSelector:
matchLabels:
app: jupyter
tenant: 'tenant-{{ .Values.name }}'
policyTypes:
- Ingress
- Egress
# Entrée : Autorise le trafic vers le Notebook Jupyter sur le port 8888
ingress:
- ports:
- protocol: TCP
port: 8888
# Sortie : Restreint les communications aux composants strictement nécessaires
egress:
# 1. Résolution DNS dans kube-system
- to:
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: kube-system
ports:
- protocol: UDP
port: 53
- protocol: TCP
port: 53
# 2. Flux vers l'API MinIO (Stockage S3)
- to:
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: minio
ports:
- protocol: TCP
port: 9000
@@ -1,3 +1,4 @@
# TODO: Attach IAM to the SA
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
+1 -1
View File
@@ -11,7 +11,7 @@ spec:
repoURL: https://git.bouvais.lu/adrien/ctie-exercice repoURL: https://git.bouvais.lu/adrien/ctie-exercice
revision: main revision: main
files: files:
- path: "tenants/*/config.yaml" - path: "tenants/tenant-*/config.yaml"
template: template:
metadata: metadata:
name: 'tenant-{{ trimPrefix "tenant-" .path.basename }}' name: 'tenant-{{ trimPrefix "tenant-" .path.basename }}'
+2
View File
@@ -9,6 +9,8 @@ spec:
destinations: destinations:
- server: https://kubernetes.default.svc - server: https://kubernetes.default.svc
namespace: 'tenant-*' namespace: 'tenant-*'
- server: https://kubernetes.default.svc
namespace: 'minio'
clusterResourceWhitelist: clusterResourceWhitelist:
- group: '' - group: ''
+13
View File
@@ -0,0 +1,13 @@
FROM alpine:3.20
RUN apk add --no-cache curl bash openssl \
&& curl -fsSL -o /usr/local/bin/mc https://dl.min.io/client/mc/release/linux-amd64/mc \
&& chmod +x /usr/local/bin/mc \
&& curl -fsSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -fsSL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
&& chmod +x /usr/local/bin/kubectl \
&& adduser -D -u 1000 runner
USER runner
WORKDIR /home/runner
ENTRYPOINT ["/bin/bash"]
+30
View File
@@ -1,3 +1,33 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: minio-provisioner
namespace: minio
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: secret-writer
namespace: minio
rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["create", "get", "update", "patch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: minio-provisioner-secret-writer
namespace: minio
subjects:
- kind: ServiceAccount
name: minio-provisioner
namespace: minio
roleRef:
kind: Role
name: secret-writer
apiGroup: rbac.authorization.k8s.io
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
+1 -4
View File
@@ -1,6 +1,4 @@
image: version: "1.0.0"
repository: registry.bouvais.lu/tenant/jupyter
tag: "1.0.1"
resources: resources:
requests: requests:
@@ -9,4 +7,3 @@ resources:
limits: limits:
cpu: "1" cpu: "1"
memory: 2Gi memory: 2Gi
+4 -6
View File
@@ -1,11 +1,9 @@
image: version: "1.0.0"
repository: registry.bouvais.lu/tenant/jupyter
tag: "1.0.1"
resources: resources:
requests: requests:
cpu: 250m cpu: 100m
memory: 512Mi memory: 512Mi
limits: limits:
cpu: "1" cpu: 250m
memory: 2Gi memory: 1Gi
+9
View File
@@ -0,0 +1,9 @@
version: "1.0.0"
resources:
requests:
cpu: 250m
memory: 512Mi
limits:
cpu: "1"
memory: 2Gi