diff options
Diffstat (limited to 'kubernetes/contrib/charts')
8 files changed, 32 insertions, 101 deletions
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml b/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml index ccde9a0fbc..c23e29a11d 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml @@ -1,66 +1,18 @@ -# text_field: -# type: text -# label: Custom Text -# description: Enter text in a text field. -# required: false -# filterable: true -# weight: 0 -# on_objects: -# - dcim.models.Device -# - dcim.models.Rack -# - ipam.models.IPAddress -# - ipam.models.Prefix -# - tenancy.models.Tenant -# - virtualization.models.VirtualMachine -# integer_field: -# type: integer -# label: Custom Number -# description: Enter numbers into an integer field. -# required: true -# filterable: true -# weight: 10 -# on_objects: -# - tenancy.models.Tenant -# selection_field: -# type: selection -# label: Choose between items -# required: false -# filterable: true -# weight: 30 -# on_objects: -# - dcim.models.Device -# choices: -# - value: First Item -# weight: 10 -# - value: Second Item -# weight: 20 -# - value: Third Item -# weight: 30 -# - value: Fifth Item -# weight: 50 -# - value: Fourth Item -# weight: 40 -# boolean_field: -# type: boolean -# label: Yes Or No? -# required: true -# filterable: true -# default: "false" # important: but "false" in quotes! -# weight: 90 -# on_objects: -# - dcim.models.Device -# url_field: -# type: url -# label: Hyperlink -# description: Link to something nice. -# required: true -# filterable: false -# on_objects: -# - tenancy.models.Tenant -# date_field: -# type: date -# label: Important Date -# required: false -# filterable: false -# on_objects: -# - dcim.models.Device +external-key: + description: "The external-key uniquely identify the resources to a service within ONAP." + filterable: true + label: ONAP external key + on_objects: + - ipam.models.IPAddress + required: true + type: text + weight: 0 +resource-name: + description: "The resource-name of the element using this IP." + filterable: true + label: ONAP resource name + on_objects: + - ipam.models.IPAddress + required: true + type: text + weight: 0
\ No newline at end of file diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml b/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml index 984c328c16..77d330beac 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml @@ -3,7 +3,7 @@ onap: last_name: McQueen email: steve.mcqueen@onap.org password: onap123$ - api_token: onceuponatimeiplayedwithnetbox20180814 + api_token: onceuponatimeiplayedwithnetbox20180814 # This API KEY is used by SDNC, if you edit it, make sure to change it in the netbox.properties file is_staff: true # whether user is admin or not, default = false is_active: true # whether user is active, default = true is_superuser: true # Whether user has all edit rights or not, default = false
\ No newline at end of file diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml index eacd4959e8..f741cba64c 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml @@ -15,6 +15,7 @@ */}} {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} +{{- if not .Values.persistence.storageClass -}} kind: PersistentVolume apiVersion: v1 metadata: @@ -35,3 +36,4 @@ spec: hostPath: path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}/app {{- end -}} +{{- end -}} 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 b911d239e5..8fbd4544dc 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml @@ -27,12 +27,14 @@ metadata: heritage: "{{ .Release.Service }}" {{- if .Values.persistence.annotations }} annotations: -{{ toYaml .Values.persistence.annotations | indent 4 }} +{{ .Values.persistence.annotations | indent 4 }} {{- end }} spec: +{{- if not .Values.persistence.storageClass -}} selector: matchLabels: name: {{ .Release.Name }}-{{ .Values.persistence.staticPvName }} +{{- end }} accessModes: - {{ .Values.persistence.accessMode }} resources: diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml index 9d5060de03..49a96eb053 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml @@ -77,25 +77,10 @@ affinity: {} ## Persist data to a persitent volume persistence: enabled: true - - ## A manually managed Persistent Volume and Claim - ## Requires persistence.enabled: true - ## If defined, PVC must be created manually before volume will be bound - # existingClaim: volumeReclaimPolicy: Retain - - ## database data Persistent Volume Storage Class - ## If defined, storageClassName: <storageClass> - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" accessMode: ReadWriteMany size: 100Mi - mountPath: /dockerdata-nfs - mountSubPath: netbox/shared + storageClass: "nfs-dev-sc" # Names used for shared pv/pvcs across App & Nginx containers staticPvName: netbox-static diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml index 882aed7cef..a19f5001e5 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml @@ -15,6 +15,7 @@ */}} {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} +{{- if not .Values.persistence.storageClass -}} kind: PersistentVolume apiVersion: v1 metadata: @@ -35,3 +36,4 @@ spec: hostPath: path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }} {{- end -}} +{{- end -}}
\ No newline at end of file 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 a3813f1af8..77602117a6 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml @@ -27,12 +27,14 @@ metadata: heritage: "{{ .Release.Service }}" {{- if .Values.persistence.annotations }} annotations: -{{ toYaml .Values.persistence.annotations | indent 4 }} +{{ .Values.persistence.annotations | indent 4 }} {{- end }} spec: +{{- if not .Values.persistence.storageClass -}} selector: matchLabels: name: {{ include "common.fullname" . }} +{{- end }} accessModes: - {{ .Values.persistence.accessMode }} resources: diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml index 06127e3a1f..c54c3a68f5 100755 --- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml +++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml @@ -56,25 +56,11 @@ readiness: ## Persist data to a persitent volume persistence: enabled: true - - ## A manually managed Persistent Volume and Claim - ## Requires persistence.enabled: true - ## If defined, PVC must be created manually before volume will be bound - # existingClaim: volumeReclaimPolicy: Retain - - ## database data Persistent Volume Storage Class - ## If defined, storageClassName: <storageClass> - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" + storageClass: "nfs-dev-sc" accessMode: ReadWriteMany size: 1Gi - mountPath: /dockerdata-nfs - mountSubPath: netbox/postgres/data + service: type: ClusterIP name: netbox-postgres |