Merge branch 'release/v3.1.1-3' into main

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v3.1.1-3] - 2024-10-28
+### Changed
+- [#14] Use `ces-container-registries` secret for pulling container images as default.
+
 ## [v3.1.1-2] - 2024-10-17
 ### Fixed
 - [#12] Path for lokiCanary image in patch templates.

Jenkinsfile

@@ -1,5 +1,5 @@
 #!groovy
-@Library('github.com/cloudogu/ces-build-lib@2.4.0')
+@Library('github.com/cloudogu/ces-build-lib@3.0.0')
 import com.cloudogu.ces.cesbuildlib.*
 
 git = new Git(this, "cesmarvin")

Makefile

@@ -1,6 +1,6 @@
 ARTIFACT_ID=k8s-loki
-MAKEFILES_VERSION=9.2.1
-VERSION=3.1.1-2
+MAKEFILES_VERSION=9.3.2
+VERSION=3.1.1-3
 
 .DEFAULT_GOAL:=help
 

build/make/build.mk

@@ -3,7 +3,7 @@
 ADDITIONAL_LDFLAGS?=-extldflags -static
 LDFLAGS?=-ldflags "$(ADDITIONAL_LDFLAGS) -X main.Version=$(VERSION) -X main.CommitID=$(COMMIT_ID)"
 GOIMAGE?=golang
-GOTAG?=1.22
+GOTAG?=1.23
 GOOS?=linux
 GOARCH?=amd64
 PRE_COMPILE?=

build/make/k8s-dogu.tpl

@@ -1,4 +1,4 @@
-apiVersion: k8s.cloudogu.com/v1
+apiVersion: k8s.cloudogu.com/v2
 kind: Dogu
 metadata:
   name: NAME

build/make/static-analysis.mk

@@ -2,12 +2,12 @@
 
 STATIC_ANALYSIS_DIR=$(TARGET_DIR)/static-analysis
 GOIMAGE?=golang
-GOTAG?=1.22
+GOTAG?=1.23
 CUSTOM_GO_MOUNT?=-v /tmp:/tmp
 
 REVIEW_DOG=$(TMP_DIR)/bin/reviewdog
 LINT=$(TMP_DIR)/bin/golangci-lint
-LINT_VERSION?=v1.58.2
+LINT_VERSION?=v1.61.0
 # ignore tests and mocks
 LINTFLAGS=--tests=false --exclude-files="^.*_mock.go$$" --exclude-files="^.*/mock.*.go$$" --timeout 10m --issues-exit-code 0
 ADDITIONAL_LINTER=-E bodyclose -E containedctx -E contextcheck -E decorder -E dupl -E errname -E forcetypeassert -E funlen -E unparam

k8s/helm/values.yaml

@@ -1,6 +1,8 @@
 lokiGatewaySecretName: "k8s-loki-gateway-secret"
 
 loki:
+  imagePullSecrets:
+    - name: "ces-container-registries"
   nameOverride: "k8s-loki"
   kubectlImage:
     registry: docker.io