Skip to content

Commit

Permalink
Remove NFS for pgconfig example
Browse files Browse the repository at this point in the history
  • Loading branch information
danduk82 committed Sep 30, 2024
1 parent bc6b62e commit 133bda3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ example-jdbc: example-common
${HELM} dependency update examples/jdbc
${HELM} upgrade --install gs-cloud-jdbc examples/jdbc

.PHONY: example-common-no-nfs
example-common-no-nfs: dependencies
${HELM} dependency update examples/common
${HELM} upgrade --install --set-json 'nfsenabled=false' gs-cloud-common examples/common

.PHONY: example-pgconfig-acl
example-pgconfig-acl: example-common
example-pgconfig-acl: example-common-no-nfs
${HELM} dependency update examples/pgconfig-acl
${HELM} upgrade --install gs-cloud-pgconfig-acl examples/pgconfig-acl
2 changes: 2 additions & 0 deletions examples/common/templates/pv_pvc.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

{{- if (eq .Values.nfsenabled true) }}
{{- range $key, $definition := .Values.nfs }}
---
# PV {{ print $key }}
Expand Down Expand Up @@ -32,3 +33,4 @@ spec:
volumeName: {{$definition.pvname}}
storageClassName: ""
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions examples/common/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
nfsserver: 'not-set'
nfsenabled: true
nfs:
raster:
pvcname: gs-cloud-raster-nfs-claim
Expand Down
8 changes: 1 addition & 7 deletions examples/pgconfig-acl/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,10 @@ postgresql:
scriptsConfigMap: install-postgis-configmap

additionalVolumes: &additional-volumes
datadir:
persistentVolumeClaim:
claimName: gs-cloud-datadir-nfs-claim
cache:
persistentVolumeClaim:
claimName: gs-cloud-gwc-cache-nfs-claim
emptyDir: {}

additionalVolumeMounts: &additional-volume-mounts
/opt/app/data_directory:
name: 'datadir'
/mnt/cache:
name: 'cache'

Expand Down

0 comments on commit 133bda3

Please sign in to comment.