remove extra code

3 files changed, 2 insertions, 54 deletions

diff --git a/grumpy/gitolite/templates/git-pvc.yaml b/grumpy/gitolite/templates/git-pvc.yaml
deleted file mode 100644
index 8d10d3e..0000000
--- a/grumpy/gitolite/templates/git-pvc.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-{{- if and .Values.Persistence.Git.Enabled -}}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "gitolite.claimname.git" . }}
-  labels:
-    app: {{ template "gitolite.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  accessModes:
-    - {{ .Values.Persistence.Git.AccessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.Persistence.Git.Size | quote }}
-{{- if .Values.Persistence.Git.StorageClass }}
-{{- if (eq "-" .Values.Persistence.Git.StorageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.Persistence.Git.StorageClass }}"
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/grumpy/gitolite/templates/gitolite-deployment.yaml b/grumpy/gitolite/templates/gitolite-deployment.yaml
index 14aceaa..39717b9 100644
--- a/grumpy/gitolite/templates/gitolite-deployment.yaml
+++ b/grumpy/gitolite/templates/gitolite-deployment.yaml
@@ -85,12 +85,8 @@ spec:
       volumes:
       - name: gitolite-ssh-keys
         persistentVolumeClaim:
-          claimName: {{ .Values.Persistence.SshKeys.ExistingClaim | default (include "gitolite.claimname.ssh-keys" .) }}
+          claimName: gitolite-storage-ssh
       - name: gitolite-git
-      {{- if .Values.Persistence.Git.ExistingClaim  }}
         persistentVolumeClaim:
-          claimName: {{ .Values.Persistence.Git.ExistingClaim | default (include "gitolite.claimname.git" .) }}
-      {{- else }}
-        emptyDir: {}
-      {{- end -}}
+          claimName: gitolite-storage
 
diff --git a/grumpy/gitolite/templates/ssh-keys-pvc.yaml b/grumpy/gitolite/templates/ssh-keys-pvc.yaml
deleted file mode 100644
index 02d59f3..0000000
--- a/grumpy/gitolite/templates/ssh-keys-pvc.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-{{- if and .Values.Persistence.SshKeys.Enabled -}}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "gitolite.claimname.ssh-keys" . }}
-  labels:
-    app: {{ template "gitolite.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  accessModes:
-    - {{ .Values.Persistence.SshKeys.AccessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.Persistence.SshKeys.Size | quote }}
-{{- if .Values.Persistence.SshKeys.StorageClass }}
-{{- if (eq "-" .Values.Persistence.SshKeys.StorageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.Persistence.SshKeys.StorageClass }}"
-{{- end }}
-{{- end }}
-{{- end }}