From 42cef5b06ca08c5d628b046a17319796644a06db Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 25 Oct 2024 13:36:43 +0200 Subject: [PATCH 1/5] #12 Use ces-container-registries to avoid editing the registry configuration on the nodes of the cluster. --- CHANGELOG.md | 2 ++ k8s/helm/values.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3ae794..8aadcb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- [#14] Use `ces-container-registries` secret for pulling container images as default. ## [v3.1.1-2] - 2024-10-17 ### Fixed diff --git a/k8s/helm/values.yaml b/k8s/helm/values.yaml index 5eb0644..de15268 100644 --- a/k8s/helm/values.yaml +++ b/k8s/helm/values.yaml @@ -1,6 +1,8 @@ lokiGatewaySecretName: "k8s-loki-gateway-secret" loki: + imagePullSecrets: + - "ces-container-registries" nameOverride: "k8s-loki" kubectlImage: registry: docker.io From bd8d29ad05113819be552ea40f4f307927422d0b Mon Sep 17 00:00:00 2001 From: Jeremias Weber Date: Mon, 28 Oct 2024 10:18:17 +0100 Subject: [PATCH 2/5] #14 Update makefiles and build lib --- Jenkinsfile | 2 +- Makefile | 2 +- build/make/build.mk | 2 +- build/make/k8s-dogu.tpl | 2 +- build/make/static-analysis.mk | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 858497c..4a1462f 100644 --- a/Jenkinsfile +++ b/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") diff --git a/Makefile b/Makefile index 7f4d2aa..b61d3d9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ARTIFACT_ID=k8s-loki -MAKEFILES_VERSION=9.2.1 +MAKEFILES_VERSION=9.3.2 VERSION=3.1.1-2 .DEFAULT_GOAL:=help diff --git a/build/make/build.mk b/build/make/build.mk index 857c11d..d3581de 100644 --- a/build/make/build.mk +++ b/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?= diff --git a/build/make/k8s-dogu.tpl b/build/make/k8s-dogu.tpl index 296da65..91e2bb2 100644 --- a/build/make/k8s-dogu.tpl +++ b/build/make/k8s-dogu.tpl @@ -1,4 +1,4 @@ -apiVersion: k8s.cloudogu.com/v1 +apiVersion: k8s.cloudogu.com/v2 kind: Dogu metadata: name: NAME diff --git a/build/make/static-analysis.mk b/build/make/static-analysis.mk index 0ed0de3..00c406f 100644 --- a/build/make/static-analysis.mk +++ b/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 From 6ea8d4f6e98605526b7bb8aec747b9f4643e865c Mon Sep 17 00:00:00 2001 From: Jeremias Weber Date: Mon, 28 Oct 2024 10:20:39 +0100 Subject: [PATCH 3/5] #14 Fix image pull secret --- k8s/helm/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/helm/values.yaml b/k8s/helm/values.yaml index de15268..c65e3c1 100644 --- a/k8s/helm/values.yaml +++ b/k8s/helm/values.yaml @@ -2,7 +2,7 @@ lokiGatewaySecretName: "k8s-loki-gateway-secret" loki: imagePullSecrets: - - "ces-container-registries" + - name: "ces-container-registries" nameOverride: "k8s-loki" kubectlImage: registry: docker.io From 3eca66eb49054336d388bff20b4a70f52ebb3a6a Mon Sep 17 00:00:00 2001 From: Jeremias Weber Date: Mon, 28 Oct 2024 14:35:09 +0100 Subject: [PATCH 4/5] Bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b61d3d9..a31a0aa 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ARTIFACT_ID=k8s-loki MAKEFILES_VERSION=9.3.2 -VERSION=3.1.1-2 +VERSION=3.1.1-3 .DEFAULT_GOAL:=help From 06df4d06560352c7b4ffb4e315a701517223ec85 Mon Sep 17 00:00:00 2001 From: Jeremias Weber Date: Mon, 28 Oct 2024 14:35:20 +0100 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aadcb7..2b4f521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v3.1.1-3] - 2024-10-28 ### Changed - [#14] Use `ces-container-registries` secret for pulling container images as default.