Fix conflixed

Merge branch 'main' into 97-give-hydra-a-database-backend

.gitlab-ci.yml

@@ -180,3 +180,4 @@ behave-integration:
 #     - echo "Reverting back to main to squash commits"
 #     - git reset --soft main
 #     - git lint
+

helmchart/single-sign-on/Chart.yaml

 apiVersion: v1
 description: A Helm chart for Stackspin's Single sign-on components
 name: single-sign-on
+<<<<<<< HEAD
 version: 0.4.1
+=======
+version: 0.4.0
+>>>>>>> main

helmchart/single-sign-on/templates/job-migration.yaml

@@ -16,8 +16,8 @@ metadata:
     helm.sh/hook: "pre-upgrade"
     {{- end }}
     helm.sh/hook-weight: "1"
-    # helm.sh/hook: "post-install, post-upgrade"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    {{- end }}
 spec:
   template:
     {{- with .Values.kratos.job.annotations }}

helmchart/single-sign-on/values.yaml

@@ -179,6 +179,9 @@ kratos:
           connection_uri: smtps://username:password@smtp.example.com:456/
 
 hydra:
+  # Fix for this issue: https://github.com/ory/k8s/issues/367
+  image:
+    tag: v1.10.5-sqlite
   maester:
     # hydra.maester.enabled instal hydra-maester which is enabled by default
     # oauth client management is handled via jobs right now so there is no need to it