aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/contrib
diff options
context:
space:
mode:
authorMartin Ouimet <martin.ouimet@bell.ca>2018-09-11 16:07:02 -0400
committerMartin Ouimet <martin.ouimet@bell.ca>2018-09-11 16:07:02 -0400
commita7a1cfcb91f35df6c835aab8bfbfb766c41d1ee2 (patch)
tree7c46316970d0d029cfddbda1451ca42b3cd99c04 /kubernetes/contrib
parentae397d001bf2b649397b6ca69aff881ffc6653fd (diff)
Fix not using storageClass issue
the PVC yaml definition was corrupted and mountPath were missing when not using storageClass. Fixed PVC template of Postgress and Netbox-app charts. Change-Id: Id018a5f5bf1e4a928cbcbdb6eefc43a1a0f08244 Issue-ID: CCSDK-533 Signed-off-by: Martin Ouimet <martin.ouimet@bell.ca>
Diffstat (limited to 'kubernetes/contrib')
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml20
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml2
-rwxr-xr-xkubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml14
4 files changed, 33 insertions, 5 deletions
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml
index 8fbd4544dc..3489049602 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml
@@ -30,7 +30,7 @@ metadata:
{{ .Values.persistence.annotations | indent 4 }}
{{- end }}
spec:
-{{- if not .Values.persistence.storageClass -}}
+{{- if not .Values.persistence.storageClass }}
selector:
matchLabels:
name: {{ .Release.Name }}-{{ .Values.persistence.staticPvName }}
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
index 49a96eb053..a1e330a260 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
@@ -64,6 +64,12 @@ service:
internalPort: 8001
portName: netbox-app
+ # The following subnet pool will be
+ # configured in Netbox by provisioning script.
+ vfw_protected_pool: 192.168.20.0/24
+ vfw_unprotected_pool: 192.168.10.0/24
+ vfw_mgmt_pool: 10.0.101.0/24
+
ingress:
enabled: false
@@ -80,11 +86,21 @@ persistence:
volumeReclaimPolicy: Retain
accessMode: ReadWriteMany
size: 100Mi
- storageClass: "nfs-dev-sc"
- # Names used for shared pv/pvcs across App & Nginx containers
+ # Uncomment the storageClass parameter to use an existing PV
+ # that will match the following class.
+ # When uncomment the storageClass, the PV is not created anymore.
+
+ # storageClass: "nfs-dev-sc"
+
staticPvName: netbox-static
+ # When using storage class, mountPath and mountSubPath are
+ # simply ignored.
+
+ mountPath: /dockerdata-nfs
+ mountSubPath: netbox/app
+
# probe configuration parameters
liveness:
initialDelaySeconds: 10
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml
index 77602117a6..30bba6da31 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml
@@ -30,7 +30,7 @@ metadata:
{{ .Values.persistence.annotations | indent 4 }}
{{- end }}
spec:
-{{- if not .Values.persistence.storageClass -}}
+{{- if not .Values.persistence.storageClass }}
selector:
matchLabels:
name: {{ include "common.fullname" . }}
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml
index c54c3a68f5..39ff3edfaf 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml
@@ -57,10 +57,22 @@ readiness:
persistence:
enabled: true
volumeReclaimPolicy: Retain
- storageClass: "nfs-dev-sc"
+
+ # Uncomment the storageClass parameter to use an existing PV
+ # that will match the following class.
+ # When uncomment the storageClass, the PV is not created anymore.
+
+ # storageClass: "nfs-dev-sc"
+
accessMode: ReadWriteMany
size: 1Gi
+ # When using storage class, mountPath and mountSubPath are
+ # simply ignored.
+
+ mountPath: /dockerdata-nfs
+ mountSubPath: netbox/postgres/data
+
service:
type: ClusterIP
name: netbox-postgres