Merge branch 'release/v0.2.0' into main

cloudogu · Mar 20, 2024 · 03fdc1e · 03fdc1e
2 parents ae6e018 + b5c7903
commit 03fdc1e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v0.2.0] - 2024-03-20
+### Added
+- [71] Add optional volume mount for self-signed certificate for the dogu registry.
+
 ## [v0.1.0] - 2024-03-20
 ### Added
 General:

diff --git a/Dockerfile b/Dockerfile
@@ -34,7 +34,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="hello@cloudogu.com" \
       NAME="k8s-blueprint-operator" \
-      VERSION="0.1.0"
+      VERSION="0.2.0"
 
 WORKDIR /
 COPY --from=builder /workspace/target/k8s-blueprint-operator .

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-blueprint-operator
-VERSION=0.1.0
+VERSION=0.2.0
 IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
 GOTAG=1.21
 MAKEFILES_VERSION=9.0.1

diff --git a/k8s/helm/component-patch-tpl.yaml b/k8s/helm/component-patch-tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 values:
   images:
-    blueprintOperator: cloudogu/k8s-blueprint-operator:0.1.0
+    blueprintOperator: cloudogu/k8s-blueprint-operator:0.2.0
     kubeRbacProxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
 patches:
   values.yaml:

diff --git a/k8s/helm/templates/deployment.yaml b/k8s/helm/templates/deployment.yaml
@@ -99,9 +99,18 @@ spec:
               drop:
                 - ALL
           imagePullPolicy: {{ .Values.manager.imagePullPolicy }}
+          volumeMounts:
+            - mountPath: /etc/ssl/certs/dogu-registry-cert.pem
+              name: dogu-registry-cert
+              subPath: dogu-registry-cert.pem
       securityContext:
         runAsNonRoot: true
         seccompProfile:
           type: RuntimeDefault
       serviceAccountName: {{ include "k8s-blueprint-operator.name" . }}-controller-manager
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10
+      volumes:
+        - name: dogu-registry-cert
+          secret:
+            optional: true
+            secretName: {{ .Values.doguRegistry.certificate.secret }}
diff --git a/k8s/helm/values.yaml b/k8s/helm/values.yaml
@@ -2,7 +2,7 @@ manager:
   replicas: 1
   image:
     repository: cloudogu/k8s-blueprint-operator
-    tag: 0.1.0
+    tag: 0.2.0
   imagePullPolicy: IfNotPresent
   env:
     logLevel: info
@@ -33,3 +33,6 @@ healthConfig:
   wait:
     timeout: 10m
     interval: 10s
+doguRegistry:
+  certificate:
+    secret: dogu-registry-cert
diff --git a/main.go b/main.go
@@ -28,7 +28,7 @@ import (
 	k8sv1 "github.com/cloudogu/k8s-blueprint-operator/pkg/adapter/kubernetes/blueprintcr/v1"
 	"github.com/cloudogu/k8s-blueprint-operator/pkg/adapter/reconciler"
 	"github.com/cloudogu/k8s-blueprint-operator/pkg/config"
-	//+kubebuilder:scaffold:imports
+	// +kubebuilder:scaffold:imports
 )
 
 var (
@@ -49,7 +49,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(k8sv1.AddToScheme(scheme))
-	//+kubebuilder:scaffold:scheme
+	// +kubebuilder:scaffold:scheme
 }
 
 func main() {