From b4df821988c3737040b0552bc3b34cebcd1730b9 Mon Sep 17 00:00:00 2001
From: Gary H <26419401+Gary-H9@users.noreply.github.com>
Date: Thu, 25 Jul 2024 15:07:42 +0000
Subject: [PATCH] :alert: Lints - the mint for IT Professionals

---
 .flake8                                    |  2 +-
 Makefile                                   | 13 +++++++++++++
 chart/values.yaml                          |  8 ++++----
 container/src/usr/local/bin/entrypoint.sh  |  0
 container/src/usr/local/bin/healthcheck.sh |  0
 container/src/usr/local/bin/init-nginx.sh  |  0
 contrib/Dockerfile.ollama                  |  2 ++
 ollamate/settings.py                       |  3 ++-
 8 files changed, 22 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 container/src/usr/local/bin/entrypoint.sh
 mode change 100644 => 100755 container/src/usr/local/bin/healthcheck.sh
 mode change 100644 => 100755 container/src/usr/local/bin/init-nginx.sh

diff --git a/.flake8 b/.flake8
index f4cefcf..d023597 100644
--- a/.flake8
+++ b/.flake8
@@ -1,5 +1,5 @@
 [flake8]
-max-line-length = 100
+max-line-length = 150
 extend-ignore = E203, E704
 exclude =
     venv
diff --git a/Makefile b/Makefile
index be3b1d5..046c806 100644
--- a/Makefile
+++ b/Makefile
@@ -48,3 +48,16 @@ test: build-container
 
 ct:
 	ct lint --charts chart
+
+
+super-linter:
+	docker run -e RUN_LOCAL=true \
+	-e DEFAULT_BRANCH=main \
+	-e VALIDATE_ALL_CODEBASE=false \
+	-e LINTER_RULES_PATH=/ \
+	-e PYTHON_BLACK_CONFIG_FILE=pyproject.toml \
+	-e PYTHON_FLAKE8_CONFIG_FILE=.flake8 \
+	-e PYTHON_ISORT_CONFIG_FILE=pyproject.toml \
+	-e PYTHON_MYPY_CONFIG_FILE=mypy.ini \
+	-e VALIDATE_KUBERNETES_KUBECONFORM=false \
+	-v $(shell pwd):/tmp/lint github/super-linter
diff --git a/chart/values.yaml b/chart/values.yaml
index e41dad2..59acaa6 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -99,10 +99,10 @@ affinity:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
         - matchExpressions:
-          - key: compute.analytical-platform.service.justice.gov.uk/karpenter-node-pool
-            operator: In
-            values:
-              - gpu-on-demand
+            - key: compute.analytical-platform.service.justice.gov.uk/karpenter-node-pool
+              operator: In
+              values:
+                - gpu-on-demand
 
 tolerations:
   - key: compute.analytical-platform.service.justice.gov.uk/karpenter-node-pool
diff --git a/container/src/usr/local/bin/entrypoint.sh b/container/src/usr/local/bin/entrypoint.sh
old mode 100644
new mode 100755
diff --git a/container/src/usr/local/bin/healthcheck.sh b/container/src/usr/local/bin/healthcheck.sh
old mode 100644
new mode 100755
diff --git a/container/src/usr/local/bin/init-nginx.sh b/container/src/usr/local/bin/init-nginx.sh
old mode 100644
new mode 100755
diff --git a/contrib/Dockerfile.ollama b/contrib/Dockerfile.ollama
index 8b583a0..94a446e 100644
--- a/contrib/Dockerfile.ollama
+++ b/contrib/Dockerfile.ollama
@@ -1,5 +1,7 @@
 FROM docker.io/ollama/ollama:latest
 
+#checkov:skip=CKV_DOCKER_2
+#checkov:skip=CKV_DOCKER_3
 RUN <<EOF
 # Start Ollama
 nohup ollama serve &
diff --git a/ollamate/settings.py b/ollamate/settings.py
index e228346..78195d9 100644
--- a/ollamate/settings.py
+++ b/ollamate/settings.py
@@ -9,6 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.0/ref/settings/
 """
+
 import os
 
 import environ
@@ -62,7 +63,7 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "ollamate",
-    "streamingapp"
+    "streamingapp",
     # "azure_auth"
 ]