Merge pull request #81 from embik/update-app-version-0.22

✨ Update appVersion to 0.22.0 and eliminate server volume
kcp-dev · Jan 26, 2024 · a4f4ffe · a4f4ffe
2 parents 23287d7 + b2dbc4c
commit a4f4ffe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/charts/kcp/Chart.yaml b/charts/kcp/Chart.yaml
@@ -3,8 +3,8 @@ name: kcp
 description: A prototype of a multi-tenant Kubernetes control plane for workloads on many clusters
 
 # version information
-version: 0.4.4
-appVersion: "0.21.0"
+version: 0.5.0
+appVersion: "0.22.0"
 
 # optional metadata
 type: application

diff --git a/charts/kcp/templates/front-proxy-deployment.yaml b/charts/kcp/templates/front-proxy-deployment.yaml
@@ -29,13 +29,15 @@ metadata:
     {{- include "common.labels" . | nindent 4 }}
     app.kubernetes.io/component: "front-proxy"
 spec:
-  replicas: 1
+  replicas: {{ .Values.kcpFrontProxy.replicas | default 1 }}
   selector:
     matchLabels:
       {{- include "common.labels.selector" . | nindent 6 }}
       app.kubernetes.io/component: "front-proxy"
+  {{- with .Values.kcpFrontProxy.strategy }}
   strategy:
-    type: Recreate
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   template:
     metadata:
       labels:

diff --git a/charts/kcp/templates/server-deployment.yaml b/charts/kcp/templates/server-deployment.yaml
@@ -1,20 +1,4 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "kcp.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    app.kubernetes.io/component: "server"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.kcp.volumeSize }}
-  {{ with .Values.kcp.volumeClassName -}}storageClassName: {{ . }}{{- end }}
 {{- if .Values.audit.enabled }}
-
----
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -86,13 +70,15 @@ metadata:
     {{- include "common.labels" . | nindent 4 }}
     app.kubernetes.io/component: "server"
 spec:
-  replicas: 1
+  replicas: {{ .Values.kcp.replicas | default 1 }}
   selector:
     matchLabels:
       {{- include "common.labels.selector" . | nindent 6 }}
       app.kubernetes.io/component: "server"
+  {{- with .Values.kcp.strategy }}
   strategy:
-    type: Recreate
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   template:
     metadata:
       labels:
@@ -328,8 +314,8 @@ spec:
           secret:
             secretName: {{ include "kcp.fullname" . }}-external-admin-kubeconfig-cert
         - name: kcp-config
-          persistentVolumeClaim:
-            claimName: {{ include "kcp.fullname" . }}
+          emptyDir:
+            sizeLimit: 50Mi
 
 ---
 apiVersion: v1

diff --git a/charts/kcp/values.yaml b/charts/kcp/values.yaml
@@ -14,6 +14,9 @@ etcd:
   profiling:
     enabled: false
 kcp:
+  replicas: 1
+  strategy:
+    type: Recreate
   image: ghcr.io/kcp-dev/kcp
   # set this to override the image tag used for kcp (determined by chart appVersion by default).
   tag: ""
@@ -63,6 +66,9 @@ kcp:
     seccompProfile:
       type: RuntimeDefault
 kcpFrontProxy:
+  replicas: 1
+  strategy:
+    type: Recreate
   image: ghcr.io/kcp-dev/kcp
   # set this to override the image tag used for kcp-front-proxy (determined by chart appVersion by default).
   tag: ""