Merge branch 'main' into 3.0

devopstales · Sep 20, 2023 · 3bab623 · 3bab623
2 parents 9754652 + 879e2e9
commit 3bab623
Show file tree

Hide file tree

Showing 10 changed files with 171 additions and 43 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,6 +9,14 @@ updates:
     directory: "src/kubedash" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "docker/kubedash" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "docs/build" # Location of package manifests
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod" # See documentation for possible values
     directory: "src/kdlogin" # Location of package manifests
     schedule:

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -17,7 +17,7 @@ image:
   # -- The docker image pull policy
   pullPolicy: Always
   # -- The docker image tag to use
-  tag: 0.1-devel
+  tag: 2.0.0
 
 # -- pullsecrets
 imagePullSecrets: []
@@ -164,4 +164,4 @@ affinity: {}
 #         operator: In
 #         values:
 #         - e2e-az1
-#         - e2e-az2
+#         - e2e-az2
diff --git a/docker/kubedash/Dockerfile b/docker/kubedash/Dockerfile
@@ -24,6 +24,10 @@ LABEL org.opencontainers.image.vendor="devopstales" \
 
 WORKDIR /code
 
+RUN addgroup -S -g 10001 kubedash && \
+    adduser -S -u 10001 kubedash -G kubedash && \
+    mkdir /tmp/kubedash && \
+    chown -R kubedash:kubedash /tmp/kubedash
 RUN addgroup -S -g 10001 kubedash && \
     adduser -S -u 10001 kubedash -G kubedash && \
     mkdir /tmp/kubedash && \

diff --git a/docker/kubedash/requirements.txt b/docker/kubedash/requirements.txt
@@ -28,12 +28,13 @@ eventlet>=0.33.3
 https://github.com/benoitc/gunicorn/archive/refs/heads/master.zip
 certifi>=2022.12.7
 #setuptools>=65.6.3
+#setuptools>=65.6.3
 pyOpenSSL>=23.0.0
 ipython>=8.10.0 # not directly required, pinned by Snyk to avoid a vulnerability
 
 # telemetry
-opentelemetry-sdk==1.16.0
-opentelemetry-api==1.16.0
-opentelemetry-exporter-otlp-proto-http==1.16.0
+opentelemetry-sdk==1.19.0
+opentelemetry-api==1.19.0
+opentelemetry-exporter-otlp-proto-http==1.19.0
 opentelemetry-instrumentation-sqlalchemy
 opentelemetry-instrumentation-flask
diff --git a/src/kubedash/functions/helper_functions.py b/src/kubedash/functions/helper_functions.py
@@ -38,9 +38,11 @@ def NoGlashErrorHandler(logger, error, action):
             elif error.status == 403:
                 logger.error("403 - Forbidden: User cannot %s" % action)
         else:
+            flash(action, "danger")
             logger.error("Exception: %s \n" % action)
     else:
-        logger.error("Exception: %s \n" % action)
+        flash("Exception: %s" % action, "danger")
+        logger.error("Exception: %s" % action)
 
 def ResponseHandler(message, status):
     flash(message, status)