fix MR conflicts

packages/apps/kubernetes/Chart.yaml

@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

packages/apps/versions_map

@@ -6,8 +6,6 @@ kafka 0.1.0 760f86d2
 kafka 0.2.0 HEAD
 kubernetes 0.1.0 f642698
 kubernetes 0.2.0 7cd7de73
-kubernetes 0.3.0 HEAD
-kubernetes-proxmox 0.2.0 HEAD
 mysql 0.1.0 f642698
 mysql 0.2.0 8b975ff0
 mysql 0.3.0 HEAD

packages/extra/Makefile

@@ -11,7 +11,7 @@ repo:
 	rm -rf "$(TMP)"
 
 fix-chartnames:
-	find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done
+	find . -name Chart.yaml -maxdepth 2 | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done
 
 gen-versions-map: fix-chartnames
 	../../hack/gen_versions_map.sh

packages/extra/etcd/Chart.yaml

@@ -3,4 +3,4 @@ name: etcd
 description: Storage for Kubernetes clusters
 icon: https://www.svgrepo.com/show/353714/etcd.svg
 type: application
-version: 2.0.1
+version: 2.0.0

packages/extra/etcd/templates/etcd-cluster.yaml

@@ -1,12 +1,3 @@
-{{- define "calculateQuotaBackendBytes" -}}
-{{- $units := dict "Ki" 1024 "Mi" 1048576 "Gi" 1073741824 -}}
-{{- $value := regexFind "[0-9.]+" . -}}
-{{- $unit := regexFind "[a-zA-Z]+" . -}}
-{{- $numericValue := float64 $value -}}
-{{- $bytes := mulf $numericValue (index $units $unit) -}}
-{{- $result := mulf $bytes 0.95 -}}
-{{- printf "%.0f" $result -}}
-{{- end -}}
 ---
 apiVersion: etcd.aenix.io/v1alpha1
 kind: EtcdCluster
@@ -14,7 +5,6 @@ metadata:
   name: etcd
 spec:
   options:
-    quota-backend-bytes: {{ include "calculateQuotaBackendBytes" .Values.size | quote }}
   replicas: {{ .Values.replicas }}
   storage:
     volumeClaimTemplate: