[ALL] Add a pre-commit default configuration (#25)

Gaspi · web-flow · commit e2dee37793f1 · 2025-01-16T11:36:47.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,40 @@
+repos:
+- repo: https://github.com/Gaspi/pre-commit-hooks
+  rev: v0.3
+  hooks:
+  # Validate schemas using the jsonschema.validators package
+  - id: validate-json-schemas
+    args:
+    # Forbid legacy https://json-schema.org/draft/2020-12/schema schema validator and suggest Draft 7 instead
+    - --forbid-legacy
+  # Ensure technically facultative attribute (such as `type`) are systematically specified
+  - id: missing-attributes-schemas
+    args:
+    # Also require `items` to be systematically specified for arrays
+    - --check-items
+    # Also require `properties` to be systematically specified for object
+    - --check-properties
+    # Also require `properties` to be systematically specified for object
+    - --check-defaults
+  - id: version-bump
+    args:
+    - --branch
+    - main
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+  # Check yaml files except for Helm templates
+  - id: check-yaml
+    exclude: "/(templates|tests)/"
+  # Check empty new line before EOF (ignore generated charts)
+  - id: end-of-file-fixer
+  # Check trailing whitespaces (ignore generated charts)
+  - id: trailing-whitespace
+
+# Run `helm lint` on all (modified) charts: this may require a manual `helm dep update`:
+# ls charts | xargs -i{} bash -c "cd charts/{} && helm dep update"
+- repo: https://github.com/gruntwork-io/pre-commit
+  rev: v0.1.15
+  hooks:
+  - id: helmlint
diff --git a/README.md b/README.md
@@ -2,12 +2,12 @@
 
 This collection of Helm Charts is tailored for datascientists !
 It is primarly designed to work with [Onyxia](https://github.com/inseefrlab/onyxia)
-See the other repository ([Helm charts](https://github.com/inseefrlab/helm-charts-interactive-services)) for interactive focused charts.  
+See the other repository ([Helm charts](https://github.com/inseefrlab/helm-charts-interactive-services)) for interactive focused charts.
 
 To use the repo on helm (version 3+) :
 ```
 helm repo add inseefrlab-datascience https://inseefrlab.github.io/helm-charts-datavisualization
-```  
+```
 
 The repo is also browsable directly https://inseefrlab.github.io/helm-charts-datavisualization/index.yaml
 
diff --git a/charts/metabase/Chart.yaml b/charts/metabase/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.1
+version: 2.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/metabase/templates/NOTES.txt b/charts/metabase/templates/NOTES.txt
@@ -4,8 +4,8 @@
 {{- if .Values.route.enabled }}
 - You can connect to Metabase with your browser on this [link](https://{{ .Values.route.hostname }})
 {{- end }}
-- After the first launch, you will need to set your login credentials. 
-- If you start a new {{ .Chart.Name }}, the same settings will be reused silently. 
+- After the first launch, you will need to set your login credentials.
+- If you start a new {{ .Chart.Name }}, the same settings will be reused silently.
 
 *NOTES about deletion :*
 
diff --git a/charts/metabase/templates/deployment.yaml b/charts/metabase/templates/deployment.yaml
@@ -76,9 +76,9 @@ spec:
               until printf "." && nc -z -w 2 {{ .Values.postgresql.fullnameOverride }} 5432; do
                   sleep 2;
               done;
-              echo 'PostgreSQL OK ✓'  
-              
-      {{- with .Values.nodeSelector }} 
+              echo 'PostgreSQL OK ✓'
+
+      {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/metabase/templates/ingress.yaml b/charts/metabase/templates/ingress.yaml
@@ -1 +1 @@
-{{ include "library-chart.ingress" . }}
+{{ include "library-chart.ingress" . }}
diff --git a/charts/metabase/templates/networkpolicy-ingress.yaml b/charts/metabase/templates/networkpolicy-ingress.yaml
@@ -1 +1 @@
-{{ include "library-chart.networkPolicyIngress" . }}
+{{ include "library-chart.networkPolicyIngress" . }}
diff --git a/charts/metabase/templates/networkpolicy.yaml b/charts/metabase/templates/networkpolicy.yaml
@@ -1 +1 @@
-{{ include "library-chart.networkPolicy" . }}
+{{ include "library-chart.networkPolicy" . }}
diff --git a/charts/metabase/templates/serviceaccount.yaml b/charts/metabase/templates/serviceaccount.yaml
@@ -1 +1 @@
-{{ include "library-chart.serviceAccount" . }}
+{{ include "library-chart.serviceAccount" . }}
diff --git a/charts/metabase/values.schema.json b/charts/metabase/values.schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "resources": {
@@ -95,27 +95,31 @@
           "type": "object",
           "description": "Define access policy to the service",
           "x-onyxia": {
-              "overwriteSchemaWith": "network-policy.json"
+            "overwriteSchemaWith": "network-policy.json"
           },
           "properties": {
-              "enabled": {
-                  "type": "boolean",
-                  "title": "Enable network policy",
-                  "description": "Only pod from the same namespace will be allowed",
-                  "default": false,
-                  "x-onyxia": {
-                      "overwriteDefaultWith": "region.defaultNetworkPolicy"
-                  }
+            "enabled": {
+              "type": "boolean",
+              "title": "Enable network policy",
+              "description": "Only pod from the same namespace will be allowed",
+              "default": false,
+              "x-onyxia": {
+                "overwriteDefaultWith": "region.defaultNetworkPolicy"
+              }
+            },
+            "from": {
+              "description": "Array of sources allowed to have network access to your service",
+              "type": "array",
+              "items": {
+                "type": "object",
+                "additionalProperties": true
               },
-              "from": {
-                  "type": "array",
-                  "description": "Array of source allowed to have network access to your service",
-                  "default": [],
-                  "x-onyxia": {
-                      "hidden": true,
-                      "overwriteDefaultWith": "region.from"
-                  }
+              "default": [],
+              "x-onyxia": {
+                "hidden": true,
+                "overwriteDefaultWith": "region.from"
               }
+            }
           }
         }
       }
diff --git a/charts/metabase/values.yaml b/charts/metabase/values.yaml
@@ -23,12 +23,12 @@ postgresql:
 security:
   mail: example@example.com
   maxLoginAttempts: 999
-  networkPolicy: 
+  networkPolicy:
     enabled: false
     from: []
   allowlist:
     enabled: true
-    ip: "0.0.0.0/0"  
+    ip: "0.0.0.0/0"
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 replicaCount: 1
@@ -69,7 +69,7 @@ networking:
 ingress:
   enabled: true
   tls: true
-  ingressClassName: ""  
+  ingressClassName: ""
   annotations: []
     # kubernetes.io/tls-acme: "true"
   hostname: cb.lab.sspcloud.fr
@@ -78,7 +78,7 @@ ingress:
   #      - chart-example.local
   useCertManager: false
   certManagerClusterIssuer: ""
-  
+
 route:
   enabled: false
   annotations: []
diff --git a/charts/redash/Chart.yaml b/charts/redash/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - Tool
   - Data
 home: https://redash.io/
-sources: 
+sources:
   - https://github.com/InseeFrLab/redash
   - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/redash
   - https://github.com/getredash/redash
@@ -23,7 +23,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.6
+version: 0.0.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/redash/templates/ingress.yaml b/charts/redash/templates/ingress.yaml
@@ -30,6 +30,6 @@ spec:
             backend:
               service:
                 name: {{ $fullName }}
-                port: 
+                port:
                   number: {{ $svcPort }}
-{{- end }}
+{{- end }}
diff --git a/charts/redash/templates/secrets.yaml b/charts/redash/templates/secrets.yaml
@@ -4,4 +4,4 @@ metadata:
   name: redash-postgres
 type: Opaque
 data:
-  connectionString: {{ printf "postgresql://%s:%s@%s:5432/%s" .Values.global.postgresql.auth.username .Values.global.postgresql.auth.password .Values.postgresql.fullnameOverride .Values.global.postgresql.auth.database| b64enc | quote }}
+  connectionString: {{ printf "postgresql://%s:%s@%s:5432/%s" .Values.global.postgresql.auth.username .Values.global.postgresql.auth.password .Values.postgresql.fullnameOverride .Values.global.postgresql.auth.database| b64enc | quote }}
diff --git a/charts/redash/values.schema.json b/charts/redash/values.schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "global": {
@@ -50,7 +50,7 @@
           }
         }
       }
-    },  
+    },
     "redash": {
       "description": "postgres specific configuration",
       "type": "object",
@@ -93,57 +93,56 @@
       "title": "Ingress Details",
       "properties": {
         "hostname": {
-            "type": "string",
-            "form": true,
-            "title": "Hostname",
-            "x-form": {
-              "value": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
-            },
-            "x-onyxia": {
-                "hidden": true,
-                "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
-            }
+          "type": "string",
+          "form": true,
+          "title": "Hostname",
+          "x-form": {
+            "value": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
+          },
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
+          }
         },
         "ingressClassName": {
-            "type": "string",
-            "form": true,
-            "title": "ingressClassName",
-            "default": "",
-            "x-form": {
-                "hidden": true,
-                "value": "{{k8s.ingressClassName}}"
-            },
-            "x-onyxia": {
-                "hidden": true,
-                "overwriteDefaultWith": "{{k8s.ingressClassName}}"
-            }
-        }       
+          "type": "string",
+          "form": true,
+          "title": "ingressClassName",
+          "default": "",
+          "x-form": {
+            "hidden": true,
+            "value": "{{k8s.ingressClassName}}"
+          },
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{k8s.ingressClassName}}"
+          }
+        }
       }
     },
-    "userPreferences":{
+    "userPreferences": {
       "description": "User Preferences",
       "type": "object",
       "properties": {
-          "darkMode": {
-              "type": "boolean",
-              "description": "dark mode is or is not enabled",
-              "default": false,
-              "x-onyxia": {
-                  "hidden": true,
-                  "overwriteDefaultWith": "user.darkMode"
-              }
-          },
-          "language": {
-              "type": "string",
-              "description": "Preferred language",
-              "default": "en",
-              "x-onyxia": {
-                  "hidden": true,
-                  "overwriteDefaultWith": "user.lang"
-              }
+        "darkMode": {
+          "type": "boolean",
+          "description": "dark mode is or is not enabled",
+          "default": false,
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "user.darkMode"
+          }
+        },
+        "language": {
+          "type": "string",
+          "description": "Preferred language",
+          "default": "en",
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "user.lang"
           }
         }
       }
-  }  
-
+    }
+  }
 }
diff --git a/charts/redash/values.yaml b/charts/redash/values.yaml
@@ -4,7 +4,7 @@ global:
       username: "admin"
       password: "changeme"
       database: "redash"
-      
+
 postgresql:
   image:
     tag: "12"
@@ -38,4 +38,4 @@ redash:
     existingSecret: toto
 
 userPreferences:
-  language: "en"
+  language: "en"
diff --git a/charts/superset/Chart.yaml b/charts/superset/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.9
+version: 0.1.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/superset/templates/ingress.yaml b/charts/superset/templates/ingress.yaml
@@ -29,6 +29,6 @@ spec:
             backend:
               service:
                 name: {{ $fullName }}
-                port: 
+                port:
                   number: 8088
-{{- end }}
+{{- end }}
diff --git a/charts/superset/values.schema.json b/charts/superset/values.schema.json
diff --git a/charts/superset/values.yaml b/charts/superset/values.yaml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{ include "library-chart.ingress" . }}`
	`1`	`+{{ include "library-chart.ingress" . }}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{ include "library-chart.networkPolicyIngress" . }}`
	`1`	`+{{ include "library-chart.networkPolicyIngress" . }}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{ include "library-chart.serviceAccount" . }}`
	`1`	`+{{ include "library-chart.serviceAccount" . }}`