a2bd98e6 by Adam Heath

Get nfs-server working with latest helmfile, and allow settings the

clusterIP.
1 parent e857363b
...@@ -10,5 +10,5 @@ generatorOptions: ...@@ -10,5 +10,5 @@ generatorOptions:
10 configMapGenerator: 10 configMapGenerator:
11 - name: nfs-scripts 11 - name: nfs-scripts
12 files: 12 files:
13 - ./scripts/wait-for-file 13 - ../../scripts/wait-for-file
14 14
......
...@@ -4,6 +4,7 @@ kind: Service ...@@ -4,6 +4,7 @@ kind: Service
4 metadata: 4 metadata:
5 name: nfs-server 5 name: nfs-server
6 spec: 6 spec:
7 type: ClusterIP
7 selector: 8 selector:
8 app: nfs-server 9 app: nfs-server
9 ports: 10 ports:
......
...@@ -6,14 +6,35 @@ environments: ...@@ -6,14 +6,35 @@ environments:
6 images: 6 images:
7 debian: "debian:bullseye-20211220" 7 debian: "debian:bullseye-20211220"
8 volume-nfs: k8s.gcr.io/volume-nfs:0.8 8 volume-nfs: k8s.gcr.io/volume-nfs:0.8
9 nfs_server:
10 jsonPatches: []
11 strategicMergePatches: []
12 service:
13 nfs_server:
14 clusterIP: 0
9 --- 15 ---
10 16
11 releases: 17 releases:
12 - name: {{ .Values.namePrefix }}nfs-server 18 - name: {{ .Values.namePrefix }}nfs-server
13 namespace: {{ .Values.namespace }} 19 namespace: {{ .Values.namespace }}
14 chart: . 20 chart: charts/nfs-server
15 values: 21 values:
16 - set-common-values.yaml.gotmpl 22 - set-common-values.yaml.gotmpl
23 jsonPatches:
24 {{- if .Values.nfs_server.service.nfs_server.clusterIP }}
25 - target:
26 kind: Service
27 name: {{ .Values.namePrefix }}nfs_server
28 namespace: {{ .Values.namespace }}
29 version: v1
30 patch:
31 - op: add
32 path: /spec/clusterIP
33 value: {{ .Values.nfs_server.service.nfs_server.clusterIP }}
34 {{- end }}
35 {{- if not (empty (.Values.nfs_server.jsonPatches)) }}
36 {{- .Values.nfs_server.jsonPatches | toYaml | indent 6 }}
37 {{- end }}
17 strategicMergePatches: 38 strategicMergePatches:
18 - apiVersion: v1 39 - apiVersion: v1
19 kind: ReplicationController 40 kind: ReplicationController
...@@ -27,4 +48,7 @@ releases: ...@@ -27,4 +48,7 @@ releases:
27 - name: nfs-data 48 - name: nfs-data
28 persistentVolumeClaim: 49 persistentVolumeClaim:
29 claimName: {{ .Values.namePrefix }}nfs-data 50 claimName: {{ .Values.namePrefix }}nfs-data
51 {{- if not (empty (.Values.nfs_server.strategicMergePatches)) }}
52 {{- .Values.nfs_server.strategicMergePatches | toYaml | indent 6 }}
53 {{- end }}
30 54
......