cobaltcore-dev
diff --git a/‎.dockerignore
+3 b/‎.dockerignore
+3
diff --git a/‎.github/workflows/reuse.yaml
+1-1 b/‎.github/workflows/reuse.yaml
+1-1
diff --git a/‎.github/workflows/test.yaml
+7-4 b/‎.github/workflows/test.yaml
+7-4
diff --git a/‎.reuse/dep5
-29 b/‎.reuse/dep5
-29
diff --git a/‎Dockerfile
+3 b/‎Dockerfile
+3
diff --git a/‎Makefile.maker.yaml
+3 b/‎Makefile.maker.yaml
+3
diff --git a/‎Tiltfile
+3 b/‎Tiltfile
+3
diff --git a/‎build/.gitignore
+3 b/‎build/.gitignore
+3
diff --git a/‎cortex.secrets.example.yaml
+3 b/‎cortex.secrets.example.yaml
+3
diff --git a/‎go.mod
+1-1 b/‎go.mod
+1-1
diff --git a/‎go.sum
-2 b/‎go.sum
-2
diff --git a/‎helm/cortex/.gitignore
+3 b/‎helm/cortex/.gitignore
+3
diff --git a/‎helm/cortex/.helmignore
+3 b/‎helm/cortex/.helmignore
+3
diff --git a/‎helm/cortex/Chart.yaml
+3 b/‎helm/cortex/Chart.yaml
+3
diff --git a/‎helm/cortex/charts/.gitignore
+3 b/‎helm/cortex/charts/.gitignore
+3
diff --git a/‎helm/cortex/templates/_conf.yaml.tpl
+3 b/‎helm/cortex/templates/_conf.yaml.tpl
+3
diff --git a/‎helm/cortex/templates/_helpers.tpl
+3 b/‎helm/cortex/templates/_helpers.tpl
+3
diff --git a/‎helm/cortex/templates/configmap.yaml
+3 b/‎helm/cortex/templates/configmap.yaml
+3
diff --git a/‎helm/cortex/templates/deployment.yaml
+3 b/‎helm/cortex/templates/deployment.yaml
+3
diff --git a/‎helm/cortex/templates/service.yaml
+3 b/‎helm/cortex/templates/service.yaml
+3
diff --git a/‎helm/cortex/values.yaml
+3 b/‎helm/cortex/values.yaml
+3
diff --git a/‎helm/postgres/.gitignore
+3 b/‎helm/postgres/.gitignore
+3
diff --git a/‎helm/postgres/.helmignore
+3 b/‎helm/postgres/.helmignore
+3
diff --git a/‎helm/postgres/Chart.yaml
+4-1 b/‎helm/postgres/Chart.yaml
+4-1
diff --git a/‎helm/postgres/charts/.gitignore
+3 b/‎helm/postgres/charts/.gitignore
+3
diff --git a/‎helm/postgres/templates/.gitkeep
+3 b/‎helm/postgres/templates/.gitkeep
+3
diff --git a/‎helm/postgres/values.yaml
+3 b/‎helm/postgres/values.yaml
+3
diff --git a/‎helm/prometheus/.gitignore
+3 b/‎helm/prometheus/.gitignore
+3
diff --git a/‎helm/prometheus/.helmignore
+3 b/‎helm/prometheus/.helmignore
+3
diff --git a/‎helm/prometheus/Chart.yaml
+4-1 b/‎helm/prometheus/Chart.yaml
+4-1
diff --git a/‎helm/prometheus/charts/.gitignore
+3 b/‎helm/prometheus/charts/.gitignore
+3
diff --git a/‎helm/prometheus/templates/alertmanager.yaml
+3 b/‎helm/prometheus/templates/alertmanager.yaml
+3
diff --git a/‎helm/prometheus/templates/alerts.yaml
+3 b/‎helm/prometheus/templates/alerts.yaml
+3
diff --git a/‎helm/prometheus/templates/prometheus.yaml
+3 b/‎helm/prometheus/templates/prometheus.yaml
+3
diff --git a/‎helm/prometheus/templates/rbac.yaml
+3 b/‎helm/prometheus/templates/rbac.yaml
+3
diff --git a/‎helm/prometheus/templates/servicemonitor.yaml
+3 b/‎helm/prometheus/templates/servicemonitor.yaml
+3
diff --git a/‎helm/prometheus/values.yaml
+3 b/‎helm/prometheus/values.yaml
+3
diff --git a/‎internal/conf/opts.go
+32-9 b/‎internal/conf/opts.go
+32-9
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 /.dockerignore
 .DS_Store
 # TODO: uncomment when applications no longer use git to get version information
 
@@ -12,5 +12,5 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: REUSE Compliance Check
-      uses: fsfe/reuse-action@v3
+      uses: fsfe/reuse-action@v5
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 name: Test
 
 on: [push]
@@ -7,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.24"
       - name: Test without Docker
@@ -24,9 +27,9 @@ jobs:
           - 2375:2375
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.24"
       - name: Test with Docker
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 FROM golang:1.24.0-alpine3.21 AS builder
 
 RUN apk add --no-cache --no-progress ca-certificates gcc git make musl-dev
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 # Configuration file for <https://github.com/cobaltcore-dev/cortex>
 
 metadata:
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 # For Pylance to not complain around:
 # type: ignore
 
 
@@ -1,2 +1,5 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 *
 !.gitignore
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 # Override config values that contain sensitive information or
 # are specific to your environment. These values can be used in the Tiltfile.
 
 
@@ -15,7 +15,7 @@ require (
 	github.com/sapcc/go-api-declarations v1.13.2
 	github.com/sapcc/go-bits v0.0.0-20250217104729-87bda5867881
 	go.uber.org/automaxprocs v1.6.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 
@@ -280,8 +280,6 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
@@ -1 +1,4 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 Chart.lock
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 # Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 apiVersion: v2
 name: cortex
 description: A Helm chart for deploying Cortex.
 
@@ -1,2 +1,5 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 *
 !.gitignore
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{- if .Values.conf }}
 {{ toYaml .Values.conf }}
 {{- end }}
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{/*
 Expand the name of the chart.
 */}}
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{- range .Values.modes }}
 ---
 apiVersion: apps/v1
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{- range .Values.modes }}
 ---
 apiVersion: v1
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 image:
   repository: cortex
   pullPolicy: Always
 
@@ -1 +1,4 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 Chart.lock
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 # Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
 
@@ -1,11 +1,14 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 apiVersion: v2
 description: Postgres setup for Cortex.
 name: cortex-postgres
 version: 0.0.1
 dependencies:
   - name: postgresql
     repository: oci://registry-1.docker.io/bitnamicharts
-    version: 12.12.10
+    version: 16.4.9
   # Owner info adds a configmap to the kubernetes cluster with information on
   # the service owner. This makes it easier to find out who to contact in case
   # of issues. See: https://github.com/sapcc/helm-charts/pkgs/container/helm-charts%2Fowner-info
 
@@ -1,2 +1,5 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 *
 !.gitignore
@@ -1 +1,4 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 In case we want to customize the postgres setup, this would be the place to do that.
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 postgresql:
   fullnameOverride: cortex-postgresql
   volumePermissions:
 
@@ -1 +1,4 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 Chart.lock
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 # Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 apiVersion: v2
 description: Prometheus alerts setup for Cortex.
 name: cortex-alerts
@@ -6,7 +9,7 @@ dependencies:
   # CRDs of the prometheus operator, such as PrometheusRule, ServiceMonitor, etc.
   - name: kube-prometheus-stack
     repository: https://prometheus-community.github.io/helm-charts
-    version: 68.5.0
+    version: 69.3.2
     condition: kube-prometheus-stack.enabled
   # Owner info adds a configmap to the kubernetes cluster with information on
   # the service owner. This makes it easier to find out who to contact in case
 
@@ -1,2 +1,5 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 *
 !.gitignore
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{- if index .Values "kube-prometheus-stack" "enabled" }}
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{- if index .Values "kube-prometheus-stack" "enabled" }}
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{- if index .Values "kube-prometheus-stack" "enabled" }}
 apiVersion: v1
 kind: ServiceAccount
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 {{- if index .Values "kube-prometheus-stack" "enabled" }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 
@@ -1,3 +1,6 @@
+# Copyright 2025 SAP SE
+# SPDX-License-Identifier: Apache-2.0
+
 global:
   prometheus: cortex-prometheus
 
 
@@ -3,9 +3,36 @@
 
 package conf
 
-import (
-	"gopkg.in/yaml.v2"
-)
+import "gopkg.in/yaml.v3"
+
+// Raw options that are not directly unmarshalled when loading from yaml.
+// Usage: call Unmarshal to unmarshal the options into a struct.
+type RawOpts struct {
+	// Postponed unmarshal function.
+	unmarshal func(any) error
+}
+
+// Create a new RawOpts instance with the given yaml string.
+func NewRawOpts(rawYaml string) RawOpts {
+	return RawOpts{unmarshal: func(v any) error {
+		return yaml.Unmarshal([]byte(rawYaml), v)
+	}}
+}
+
+// Call the postponed unmarshal function and unmarshal the options into a struct.
+func (msg *RawOpts) Unmarshal(v any) error {
+	if msg.unmarshal == nil {
+		// No unmarshal function set (e.g. empty yaml), return nil.
+		return nil
+	}
+	return msg.unmarshal(v)
+}
+
+// Override the default yaml unmarshal behavior to postpone the unmarshal.
+func (msg *RawOpts) UnmarshalYAML(unmarshal func(any) error) error {
+	msg.unmarshal = unmarshal
+	return nil
+}
 
 // Mixin that adds the ability to load options from a yaml map.
 // Usage: type StructUsingOpts struct { conf.YamlOpts[MyOpts] }
@@ -15,13 +42,9 @@ type YamlOpts[Options any] struct {
 }
 
 // Set the options contained in the opts yaml map.
-func (s *YamlOpts[Options]) Load(opts yaml.MapSlice) error {
-	bytes, err := yaml.Marshal(opts)
-	if err != nil {
-		return err
-	}
+func (s *YamlOpts[Options]) Load(opts RawOpts) error {
 	var o Options
-	if err := yaml.UnmarshalStrict(bytes, &o); err != nil {
+	if err := opts.Unmarshal(&o); err != nil {
 		return err
 	}
 	s.Options = o
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,5 @@`
	`1`	`+# Copyright 2025 SAP SE`
	`2`	`+# SPDX-License-Identifier: Apache-2.0`
	`3`	`+`
`1`	`4`	`*`
`2`	`5`	`!.gitignore`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ require (`
`15`	`15`	`github.com/sapcc/go-api-declarations v1.13.2`
`16`	`16`	`github.com/sapcc/go-bits v0.0.0-20250217104729-87bda5867881`
`17`	`17`	`go.uber.org/automaxprocs v1.6.0`
`18`		`- gopkg.in/yaml.v2 v2.4.0`
	`18`	`+ gopkg.in/yaml.v3 v3.0.1`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`require (`