Add deployment

.gitignore

@@ -1,6 +1,7 @@
 .venv-operator
 .venv-validator
 .venv-test
+.venv-chart-docs
 .venv
 .kube
 .pytest_cache

Makefile

@@ -28,13 +28,13 @@ cluster-down:
 build:
 	@docker build -t $(REGISTRY)/k8spin/k8spin-operator:latest -t $(REGISTRY)/k8spin/k8spin-operator:$(TAG_VERSION) . -f build/operator.Dockerfile
 	@docker build -t $(REGISTRY)/k8spin/k8spin-webhook:latest -t $(REGISTRY)/k8spin/k8spin-webhook:$(TAG_VERSION) . -f build/webhook.Dockerfile
+	@docker build -t $(REGISTRY)/k8spin/k8spin-reporter:latest -t $(REGISTRY)/k8spin/k8spin-reporter:$(TAG_VERSION) . -f build/reporter.Dockerfile
 
-## build: Local build the operator using buildx and multiple platforms
-## platforms defined in https://github.com/containerd/containerd/blob/v1.2.6/platforms/platforms.go#L63
-## docker > 19.03 required
+## build: Local build the operator using buildx and multiple platforms platforms defined in github.com/containerd/containerd/blob/v1.2.6/platforms/platforms.go#L63 docker 19.03 required
 buildx:
 	@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=linux/amd64,linux/arm64,linux/arm/v7 -t $(REGISTRY)/k8spin/k8spin-operator:latest -t $(REGISTRY)/k8spin/k8spin-operator:$(TAG_VERSION) . -f build/operator.Dockerfile
 	@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=linux/amd64,linux/arm64,linux/arm/v7 -t $(REGISTRY)/k8spin/k8spin-webhook:latest -t $(REGISTRY)/k8spin/k8spin-webhook:$(TAG_VERSION) . -f build/webhook.Dockerfile
+	@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=linux/amd64,linux/arm64,linux/arm/v7 -t $(REGISTRY)/k8spin/k8spin-reporter:latest -t $(REGISTRY)/k8spin/k8spin-reporter:$(TAG_VERSION) . -f build/reporter.Dockerfile
 
 ## deploy: Deploys the complete solution
 deploy: load
@@ -49,10 +49,9 @@ update: load
 	@kubectl --context kind-$(KIND_CLUSTER_NAME) delete -f ./deployments/kubernetes/ --wait=true -n default
 	@kubectl --context kind-$(KIND_CLUSTER_NAME) apply -f ./deployments/kubernetes/ -n default
 
-## test-e2e: End-to-End tests. Use `PYTEST_ADDOPTS=--keep-cluster make test-e2e` to keep cluster
-## --workers auto could be added when we want multiple workers installing the package pytest-parallel
+## test-e2e: End-to-End tests. Use `PYTEST_ADDOPTS=--keep-cluster make test-e2e` to keep cluster --workers auto could be added when we want multiple workers installing the package pytest-parallel
 test-e2e: build
-	@virtualenv -p python3.8 .venv-test
+	@virtualenv -p python3.9 .venv-test
 	source .venv-test/bin/activate; \
 	pip install -r test/requirements.txt; \
 	pip install -e k8spin_common; \
@@ -64,11 +63,12 @@ test-e2e: build
 		test/e2e;
 
 test-kubeconfig:
-	@export KUBECONFIG=.pytest-kind/k8spin-operator/kind-config-k8spin-operator
+	@export KUBECONFIG=.pytest-kind/k8spin-operator/kubeconfig
 
 load: cluster-up build
 	@kind load docker-image --name $(KIND_CLUSTER_NAME) $(REGISTRY)/k8spin/k8spin-operator:latest
 	@kind load docker-image --name $(KIND_CLUSTER_NAME) $(REGISTRY)/k8spin/k8spin-webhook:latest
+	@kind load docker-image --name $(KIND_CLUSTER_NAME) $(REGISTRY)/k8spin/k8spin-reporter:latest
 
 ## kubie: Sets the kind cluster context
 kubie:
@@ -77,13 +77,16 @@ kubie:
 publish_container_image:
 	@docker tag $(REGISTRY)/k8spin/k8spin-operator:latest $(REGISTRY)/k8spin/k8spin-operator:$(TAG_VERSION)
 	@docker tag $(REGISTRY)/k8spin/k8spin-webhook:latest $(REGISTRY)/k8spin/k8spin-webhook:$(TAG_VERSION)
+	@docker tag $(REGISTRY)/k8spin/k8spin-reporter:latest $(REGISTRY)/k8spin/k8spin-reporter:$(TAG_VERSION)
 	@docker push $(REGISTRY)/k8spin/k8spin-operator:$(TAG_VERSION)
 	@docker push $(REGISTRY)/k8spin/k8spin-webhook:$(TAG_VERSION)
+	@docker push $(REGISTRY)/k8spin/k8spin-reporter:$(TAG_VERSION)
 
 
 publish_container_image_multiarch:
 	@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=linux/amd64,linux/arm64,linux/arm/v7 -t $(REGISTRY)/k8spin/k8spin-operator:$(TAG_VERSION) . -f build/operator.Dockerfile --push
 	@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=linux/amd64,linux/arm64,linux/arm/v7 -t $(REGISTRY)/k8spin/k8spin-webhook:$(TAG_VERSION) . -f build/webhook.Dockerfile --push
+	@DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=linux/amd64,linux/arm64,linux/arm/v7 -t $(REGISTRY)/k8spin/k8spin-reporter:$(TAG_VERSION) . -f build/reporter.Dockerfile --push
 
 ## clean: Remove cached files
 clean:
@@ -105,7 +108,7 @@ lint:
 
 ## helm_chart_docs: Creates the Helm Chart Docs
 helm_chart_docs:
-	@virtualenv -p python3.8 .venv-chart-docs
+	@virtualenv -p python3.9 .venv-chart-docs
 	source .venv-chart-docs/bin/activate; \
 	pip install frigate; \
 	frigate gen deployments/helm/k8spin-operator > deployments/helm/k8spin-operator/README.md;

build/reporter.Dockerfile

@@ -0,0 +1,12 @@
+FROM python:3.9
+
+COPY k8spin_reporter/requirements.txt /src/requirements.txt
+RUN pip install -r /src/requirements.txt
+
+COPY k8spin_common /src/k8spin_common
+RUN pip install -e /src/k8spin_common
+
+COPY k8spin_reporter /app/k8spin_reporter
+
+ENTRYPOINT [ "python" ]
+CMD ["/app/k8spin_reporter/app.py"]

deployments/helm/k8spin-operator/README.md

@@ -24,6 +24,12 @@ The following table lists the configurable parameters of the K8spin-operator cha
 | `k8spin_webhook.logging_level` | K8spin-webhook logging level | `"DEBUG"` |
 | `k8spin_webhook.serviceAccount.create` | Create the k8spin-webhook service account | `true` |
 | `k8spin_webhook.serviceAccount.name` | The k8spin-webhook service account name | `null` |
+| `k8spin_reporter.image.name` | K8spin-reporter image name | `"ghcr.io/k8spin/k8spin-reporter"` |
+| `k8spin_reporter.image.tag` | K8spin-reporter image tag | `"v1.0.6"` |
+| `k8spin_reporter.image.pullPolicy` | K8spin-reporter image pull policy | `"IfNotPresent"` |
+| `k8spin_reporter.logging_level` | K8spin-reporter logging level | `"DEBUG"` |
+| `k8spin_reporter.serviceAccount.create` | Create the k8spin-reporter service account | `true` |
+| `k8spin_reporter.serviceAccount.name` | The k8spin-reporter service account name | `null` |
 | `rbac.create` | Deploys default roles | `true` |
 
 

deployments/helm/k8spin-operator/templates/k8spin_reporter_cluster_role_binding.yaml

@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: k8spin-reporter
+  labels:
+    app.kubernetes.io/name: {{ template "k8spin-reporter.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: {{ (include "reporter.serviceAccountName" .) }}
+    namespace: {{ .Release.Namespace }}

deployments/helm/k8spin-operator/templates/k8spin_reporter_deployment.yaml

@@ -0,0 +1,37 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: k8spin-reporter
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ template "k8spin-reporter.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      application: k8spin-reporter
+  template:
+    metadata:
+      labels:
+        application: k8spin-reporter
+        app.kubernetes.io/name: {{ template "k8spin-reporter.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    spec:
+      serviceAccountName: {{ (include "reporter.serviceAccountName" .) }}
+      containers:
+      - name: k8spin-reporter
+        image: "{{ .Values.k8spin_reporter.image.name }}:{{ .Values.k8spin_reporter.image.tag }}"
+        imagePullPolicy: {{ .Values.k8spin_reporter.image.pullPolicy }}
+        env:
+        - name: LOGGING_LEVEL
+          value: "{{ .Values.k8spin_reporter.logging_level }}"
+        - name: RECONCILIATION_INTERVAL_SECONDS
+          value: "{{ .Values.k8spin_reporter.reconciliation_interval_seconds }}"

deployments/helm/k8spin-operator/templates/k8spin_reporter_service_account.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.k8spin_reporter.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ (include "k8spin_reporter.serviceAccountName" .) }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ template "k8spin-reporter.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}

deployments/helm/k8spin-operator/values.yaml

@@ -19,5 +19,15 @@ k8spin_webhook:
     create: true # Create the k8spin-webhook service account
     name: # The k8spin-webhook service account name
 
+k8spin_reporter:
+  image:
+    name: ghcr.io/k8spin/k8spin-reporter # k8spin-reporter image name
+    tag: v1.0.6 # k8spin-reporter image tag
+    pullPolicy: IfNotPresent # k8spin-reporter image pull policy
+  logging_level: DEBUG # k8spin-reporter logging level
+  serviceAccount:
+    create: true # Create the k8spin-reporter service account
+    name: # The k8spin-reporter service account name
+
 rbac:
   create: true # Deploys default roles

deployments/kubernetes/operator.yaml

@@ -20,6 +20,7 @@ spec:
       containers:
       - name: k8spin-operator
         image: ghcr.io/k8spin/k8spin-operator:latest
+        imagePullPolicy: IfNotPresent
         env:
         - name: LOGGING_LEVEL
           value: DEBUG

deployments/kubernetes/reporter.yaml

@@ -0,0 +1,47 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: k8spin-reporter
+  namespace: default
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      application: k8spin-reporter
+  template:
+    metadata:
+      labels:
+        application: k8spin-reporter
+    spec:
+      serviceAccountName: k8spin-reporter
+      containers:
+      - name: k8spin-reporter
+        image: ghcr.io/k8spin/k8spin-reporter:latest
+        imagePullPolicy: IfNotPresent
+        env:
+        - name: LOGGING_LEVEL
+          value: DEBUG
+        - name: RECONCILIATION_INTERVAL_SECONDS
+          value: "15"
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: k8spin-reporter
+  namespace: default
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: k8spin-reporter
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: k8spin-reporter
+    namespace: default

deployments/kubernetes/webhook.yaml

@@ -20,6 +20,7 @@ spec:
       containers:
       - name: k8spin-webhook
         image: ghcr.io/k8spin/k8spin-webhook:latest
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 443
         env:

k8spin_common/Makefile

@@ -13,7 +13,7 @@ help: Makefile
 
 ## install: Install the project
 install:
-	@virtualenv -p python3.8 .venv
+	@virtualenv -p python3.9 .venv
 	source .venv/bin/activate; \
 	pip install -r requirements-dev.txt; \
 

k8spin_operator/Makefile

@@ -13,7 +13,7 @@ help: Makefile
 
 ## install: Install the project
 install:
-	@virtualenv -p python3.8 .venv
+	@virtualenv -p python3.9 .venv
 	source .venv/bin/activate; \
 	pip install -r requirements-dev.txt; \
 	pip install -e ../k8spin_common; \

k8spin_reporter/.gitignore

@@ -1 +1,2 @@
-k8spin.db
+k8spin.db
+dataset.sql

k8spin_reporter/Makefile

@@ -24,14 +24,18 @@ lint: install
 	pylint app.py k8spin_reporter; \
 
 ## run: Run it locally
-run: install kubeconfig resetdb
+run: install kubeconfig
 	source .venv/bin/activate; \
 	KUBECONFIG=$(shell pwd)/kubeconfig python app.py
 
 ## kubeconfig: Gather k8spin-operator kubeconfig (kind). Requires to run make deploy in the root project
 kubeconfig: 
 	@kind get kubeconfig --name k8spin-operator > kubeconfig
 
-## resetdb: Reset the database
+## resetdb: Reset the database. Takes some time
 resetdb:
-	@rm -f k8spin.db && sqlite3 k8spin.db < schema.sql
+	@virtualenv -p python3.9 .venv
+	source .venv/bin/activate; \
+	pip install -r requirements-dev.txt; \
+	python gen.py > dataset.sql
+	@rm -f k8spin.db && sqlite3 k8spin.db < schema.sql && sqlite3 k8spin.db < dataset.sql