Merge pull request #360 from projectsyn/template-sync

Update from component template

Author: simu

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "8f2273cd8ab13c55eb0f6dd621c70c4c9e4786fd",
+  "commit": "5ae57721558399419f867334e31d23a7f7a892ba",
   "checkout": "main",
   "context": {
     "cookiecutter": {
@@ -25,7 +25,7 @@
       "github_name": "component-keycloak",
       "github_url": "https://github.com/projectsyn/component-keycloak",
       "_template": "https://github.com/projectsyn/commodore-component-template.git",
-      "_commit": "8f2273cd8ab13c55eb0f6dd621c70c4c9e4786fd"
+      "_commit": "5ae57721558399419f867334e31d23a7f7a892ba"
     }
   },
   "directory": null

.github/workflows/release.yaml

@@ -9,12 +9,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: "0"
       - name: Build changelog from PRs with labels
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v5
+        uses: mikepenz/release-changelog-builder-action@v6
         with:
           configuration: ".github/changelog-configuration.json"
           # PreReleases still get a changelog, but the next full release gets a diff since the last full release,

.github/workflows/test.yaml

@@ -17,13 +17,13 @@ jobs:
           - lint_yaml
           - lint_adoc
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Run ${{ matrix.command }}
         run: make ${{ matrix.command }}
   editorconfig:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: snow-actions/eclint@v1.0.1
         with:
           args: 'check'
@@ -40,15 +40,15 @@ jobs:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Determine Go version from go.mod
         run: echo "GO_VERSION=$(grep "go 1." tests/go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
       - uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -69,7 +69,7 @@ jobs:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Golden diff

Makefile

@@ -45,7 +45,7 @@ format: format_jsonnet ## All-in-one formatting
 
 .PHONY: format_jsonnet
 format_jsonnet: $(JSONNET_FILES) ## Format jsonnet files
-	$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) -- $?
+	$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) --in-place -- $?
 
 .PHONY: docs-serve
 docs-serve: ## Preview the documentation

Makefile.vars.mk

@@ -31,7 +31,7 @@ endif
 DOCKER_ARGS ?= run --rm -u "$$(id -u):$$(id -g)" --userns=$(DOCKER_USERNS) -w /$(COMPONENT_NAME) -e HOME="/$(COMPONENT_NAME)"
 
 JSONNET_FILES   ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.*jsonnet' -or -name '*.libsonnet' \))
-JSONNETFMT_ARGS ?= --in-place --pad-arrays
+JSONNETFMT_ARGS ?= --pad-arrays
 JSONNET_IMAGE   ?= ghcr.io/projectsyn/jsonnet:latest
 JSONNET_DOCKER  ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)
 

tests/golden/openshift/openshift/openshift/30_k8up.yaml

@@ -63,11 +63,19 @@ spec:
         name: ca
   check:
     schedule: 30 3 * * *
+    volumes:
+      - configMap:
+          name: k8up-custom-ca
+        name: ca
   prune:
     retention:
       keepDaily: 30
       keepLast: 20
     schedule: '@daily-random'
+    volumes:
+      - configMap:
+          name: k8up-custom-ca
+        name: ca
 ---
 apiVersion: v1
 data: