Merge pull request #6 from enix/ldap

feat(netbox): add ldap switch and a little bit more documentation
enix · May 10, 2020 · 8c3806e · 8c3806e
2 parents 829a278 + 9e0ca69
commit 8c3806e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 appVersion: "v2.8.1"
 description: NetBox is an open source web application designed to help manage and document computer networks.
 name: netbox
-version: 1.2.1
+version: 1.2.2
 icon: https://github.com/netbox-community/netbox/raw/develop/docs/netbox_logo.svg?sanitize=true
 home: https://netbox.readthedocs.io/en/stable/
 sources:

diff --git a/charts/netbox/README.md b/charts/netbox/README.md
@@ -72,6 +72,7 @@ The command removes all the Kubernetes components associated with the chart and
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
 | fullnameOverride | string | `""` | String to fully override netbox.fullname template with a string |
+| image.ldap | bool | `false` | Switch docker image tag to the ldap flavor |
 | image.pullPolicy | string | `"IfNotPresent"` | Netbox image pull policy |
 | image.repository | string | `"netboxcommunity/netbox"` | Netbox image |
 | image.tag | string | `nil` | Netbox image version |
@@ -125,6 +126,14 @@ The command removes all the Kubernetes components associated with the chart and
 | tolerations | list | `[]` | tolerations to add on Netbox Pod |
 | updateStrategy | object | `{"type":"RollingUpdate"}` | Update strategy policy |
 
+## LDAP
+
+You can use the boolean `image.ldap` to switch to ldap image (tag)[https://hub.docker.com/r/netboxcommunity/netbox/tags].
+Then use `extraEnvs` for environment configuration and `extraSecretEnvs` for password following the netbox documentation:
+
+ - https://github.com/netbox-community/netbox-docker/wiki/LDAP
+ - https://netbox.readthedocs.io/en/stable/installation/5-ldap/
+
 ## License
 
 Copyright (c) 2020 ENIX

diff --git a/charts/netbox/templates/_helpers.tpl b/charts/netbox/templates/_helpers.tpl
@@ -83,6 +83,15 @@ Create the name of the service account to use
 {{ include "netbox.fullname" . }}-initializers
 {{- end -}}
 
+{{- define "netbox.imageTag" -}}
+{{- $tag := .Chart.AppVersion -}}
+{{- if .Values.image.ldap -}}
+{{/* use "=" instead of ":=" to affect variable outside the if scope */}}
+{{- $tag = printf "%s-ldap" $tag -}}
+{{- end }}
+{{- default $tag .Values.image.tag -}}
+{{- end -}}
+
 {{/*
   https://github.com/helm/helm/issues/4535#issuecomment-416022809
 */}}

diff --git a/charts/netbox/templates/_netbox.tpl b/charts/netbox/templates/_netbox.tpl
@@ -25,7 +25,7 @@ template:
       {{- toYaml .Values.podSecurityContext | nindent 6 }}
     containers:
       - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+        image: "{{ .Values.image.repository }}:{{ include "netbox.imageTag" . }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         resources:
           {{- toYaml .Values.resources | indent 12 }}

diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
@@ -39,6 +39,8 @@ image:
   tag:
   # image.pullPolicy -- Netbox image pull policy
   pullPolicy: IfNotPresent
+  # image.ldap -- Switch docker image tag to the ldap flavor
+  ldap: false
 
 nginxImage:
   # nginxImage.repository -- Nginx image