netbox: Redo chart against 1.0.0 of docker image

Also upgrades Netbox to version 2.10.4
This commit is contained in:
Alexander Olofsson 2021-01-29 12:41:41 +01:00
parent 449cee5ad2
commit e8b01f68b3
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
3 changed files with 12 additions and 51 deletions

View file

@ -1,10 +1,11 @@
--- ---
apiVersion: v1 apiVersion: v1
appVersion: "2.10.2" appVersion: "2.10.4"
description: | description: |
An IP address management (IPAM) and data center infrastructure management (DCIM) tool. An IP address management (IPAM) and data center infrastructure management (DCIM) tool.
Important; LDAP will require reconfiguring when upgrading to chart version 2.0.0 Important; With chart version 3.0.0 the old nginx+gunicorn setup is no more, refer to
https://github.com/netbox-community/netbox-docker/releases/tag/1.0.0 for more info.
icon: https://raw.githubusercontent.com/digitalocean/netbox/develop/netbox/project-static/img/netbox.ico icon: https://raw.githubusercontent.com/digitalocean/netbox/develop/netbox/project-static/img/netbox.ico
name: netbox name: netbox
version: 2.0.4 version: 3.0.0

View file

@ -70,57 +70,25 @@ spec:
name: {{ include "netbox.fullname" . }} name: {{ include "netbox.fullname" . }}
- secretRef: - secretRef:
name: {{ include "netbox.fullname" . }} name: {{ include "netbox.fullname" . }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: netbox-static-files
mountPath: /opt/netbox/netbox/static
{{- if .Values.useUnixSocket }}
- name: netbox-config-files
mountPath: /etc/netbox/gunicorn_config.py
subPath: gunicorn_config.py
readOnly: true
- name: netbox-socket
mountPath: /tmp/netbox
{{- end }}
- name: data
mountPath: /etc/netbox/media
{{- with .Values.extraVolumeMounts }}
{{ toYaml . | nindent 12 }}
{{- end }}
- name: nginx
image: "nginx:alpine"
imagePullPolicy: Always
command:
- nginx
- -c
- /etc/netbox-nginx/nginx.conf
ports: ports:
- name: http - name: http
containerPort: 8080 containerPort: 8080
protocol: TCP protocol: TCP
- name: status
containerPort: 8081
protocol: TCP
livenessProbe: livenessProbe:
httpGet: httpGet:
port: status port: http
path: /stub_status path: /
readinessProbe: readinessProbe:
httpGet: httpGet:
port: http port: http
path: / path: /
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts: volumeMounts:
- name: netbox-config-files - name: data
mountPath: /etc/netbox-nginx/nginx.conf mountPath: /etc/netbox/media
subPath: nginx.conf {{- with .Values.extraVolumeMounts }}
readOnly: true {{ toYaml . | nindent 12 }}
- name: netbox-static-files
mountPath: /opt/netbox/netbox/static
readOnly: true
{{- if .Values.useUnixSocket }}
- name: netbox-socket
mountPath: /tmp/netbox
{{- end }} {{- end }}
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
@ -130,12 +98,6 @@ spec:
- name: netbox-config-files - name: netbox-config-files
configMap: configMap:
name: {{ .Chart.Name }}-config-files name: {{ .Chart.Name }}-config-files
- name: netbox-static-files
emptyDir: {}
{{- if .Values.useUnixSocket }}
- name: netbox-socket
emptyDir: {}
{{- end }}
- name: data - name: data
{{- if .Values.persistence.enabled }} {{- if .Values.persistence.enabled }}
persistentVolumeClaim: persistentVolumeClaim:

View file

@ -69,8 +69,6 @@ redis:
# existingDjangoSecret: netbox-django-secret # existingDjangoSecret: netbox-django-secret
# existingDjangoSecretKey: secret_key # existingDjangoSecretKey: secret_key
useUnixSocket: false
extraEnv: {} extraEnv: {}
# EMAIL_SERVER: localhost # EMAIL_SERVER: localhost
# EMAIL_PORT: 25 # EMAIL_PORT: 25