Merge branch 'release/v1.1.0' into main

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.1.0] - 2024-10-28
+### Changed
+- [#33] Make imagePullSecrets configurable via helm values and use `ces-container-registries` as default.
+
 ## [v1.0.0] - 2024-10-18
 ### Changed
 - [#31] Use cluster native config instead of the etcd.

Dockerfile

@@ -34,7 +34,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="[email protected]" \
       NAME="k8s-backup-operator" \
-      VERSION="1.0.0"
+      VERSION="1.1.0"
 
 WORKDIR /
 COPY --from=builder /workspace/target/k8s-backup-operator .

Jenkinsfile

@@ -1,6 +1,6 @@
 #!groovy
 
-@Library('github.com/cloudogu/ces-build-lib@2.3.0')
+@Library('github.com/cloudogu/ces-build-lib@3.0.0')
 import com.cloudogu.ces.cesbuildlib.*
 
 // Creating necessary git objects

Makefile

@@ -1,10 +1,10 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-backup-operator
-VERSION=1.0.0
+VERSION=1.1.0
 IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
 GOTAG?=1.23
 LINT_VERSION=v1.61.0
-MAKEFILES_VERSION=9.2.1
+MAKEFILES_VERSION=9.3.2
 STAGE?=production
 
 ADDITIONAL_CLEAN=dist-clean
@@ -53,7 +53,8 @@ helm-values-update-image-version: $(BINARY_YQ)
 helm-values-replace-image-repo: $(BINARY_YQ)
 	@if [[ ${STAGE} == "development" ]]; then \
       		echo "Setting dev image repo in target values.yaml!" ;\
-    		$(BINARY_YQ) -i e ".manager.image.repository=\"${IMAGE_DEV}\"" "${K8S_COMPONENT_TARGET_VALUES}" ;\
+    		$(BINARY_YQ) -i e ".manager.image.registry=\"$(shell echo '${IMAGE_DEV}' | sed 's/\([^\/]*\)\/\(.*\)/\1/')\"" ${K8S_COMPONENT_TARGET_VALUES} ;\
+    		$(BINARY_YQ) -i e ".manager.image.repository=\"$(shell echo '${IMAGE_DEV}' | sed 's/\([^\/]*\)\/\(.*\)/\2/')\"" ${K8S_COMPONENT_TARGET_VALUES} ;\
     	fi
 
 .PHONY: template-stage

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/component-patch-tpl.yaml

@@ -1,15 +1,17 @@
 apiVersion: v1
 values:
   images:
-    backupOperator: cloudogu/k8s-backup-operator:1.0.0
+    backupOperator: cloudogu/k8s-backup-operator:1.1.0
     kubeRbacProxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
 patches:
   values.yaml:
     kubeRbacProxy:
       image:
-        repository: "{{ registryFrom .images.kubeRbacProxy }}/{{ repositoryFrom .images.kubeRbacProxy }}"
+        registry: "{{ registryFrom .images.kubeRbacProxy }}"
+        repository: "{{ repositoryFrom .images.kubeRbacProxy }}"
         tag: "{{ tagFrom .images.kubeRbacProxy }}"
     manager:
       image:
-        repository: "{{ registryFrom .images.backupOperator }}/{{ repositoryFrom .images.backupOperator }}"
+        registry: "{{ registryFrom .images.backupOperator }}"
+        repository: "{{ repositoryFrom .images.backupOperator }}"
         tag: "{{ tagFrom .images.backupOperator }}"

k8s/helm/templates/deployment.yaml

@@ -17,12 +17,16 @@ spec:
       annotations:
         kubectl.kubernetes.io/default-container: manager
     spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       containers:
       - args:
         - --secure-listen-address=0.0.0.0:8443
         - --upstream=http://127.0.0.1:8080/
         - --v=0
-        image: {{ .Values.kubeRbacProxy.image.repository }}:{{ .Values.kubeRbacProxy.image.tag }}
+        image: "{{ .Values.kubeRbacProxy.image.registry }}/{{ .Values.kubeRbacProxy.image.repository }}:{{ .Values.kubeRbacProxy.image.tag }}"
         name: kube-rbac-proxy
         ports:
         - containerPort: 8443
@@ -48,7 +52,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: {{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}
+        image: "{{ .Values.manager.image.registry }}/{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
         imagePullPolicy: {{ .Values.manager.imagePullPolicy | default "IfNotPresent" }}
         livenessProbe:
           httpGet:

k8s/helm/templates/garbage-collection-manager-cronjob.yaml

@@ -16,6 +16,10 @@ spec:
           labels:
             {{- include "k8s-backup-operator.selectorLabels" . | nindent 12 }}
         spec:
+          {{- with .Values.global.imagePullSecrets }}
+          imagePullSecrets:
+            {{- toYaml . | nindent 10 }}
+            {{- end }}
           containers:
           - args:
             - gc
@@ -29,7 +33,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: {{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}
+            image: "{{ .Values.manager.image.registry }}/{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
             imagePullPolicy: {{ .Values.manager.imagePullPolicy }}
             name: garbage-collector
             resources:

k8s/helm/values.yaml

@@ -1,9 +1,13 @@
+global:
+  imagePullSecrets:
+    - name: "ces-container-registries"
 retention:
   strategy: keepAll
   garbageCollectionCron: "0 * * * *"
 kubeRbacProxy:
   image:
-    repository: gcr.io/kubebuilder/kube-rbac-proxy
+    registry: gcr.io
+    repository: kubebuilder/kube-rbac-proxy
     tag: v0.14.1
   resources:
     limits:
@@ -17,8 +21,9 @@ manager:
     stage: production
     logLevel: info
   image:
+    registry: docker.io
     repository: cloudogu/k8s-backup-operator
-    tag: 1.0.0
+    tag: 1.1.0
   imagePullPolicy: IfNotPresent
   resources:
     limits: