diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3d9fdb..6f3774c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * +## 1.3.0 - 2022-02-17 + +### Added + +* [141](https://github.com/nautobot/helm-charts/issues/141) - Added extraPorts for the Nautobot service, useful for sidecars + ## 1.2.4 - 2022-02-17 ### Fixed diff --git a/charts/nautobot/Chart.yaml b/charts/nautobot/Chart.yaml index a0b3fa46..bb57473b 100644 --- a/charts/nautobot/Chart.yaml +++ b/charts/nautobot/Chart.yaml @@ -20,11 +20,11 @@ annotations: - title: Prefix hierarchy url: https://raw.githubusercontent.com/nautobot/nautobot/develop/nautobot/docs/media/screenshot3.png artifacthub.io/changes: | - - kind: fixed - description: Sidecars are the wrong data type in the schema + - kind: added + description: extraPorts for the Nautobot service, useful for sidecars links: - name: Github Issue - url: https://github.com/nautobot/helm-charts/issues/138 + url: https://github.com/nautobot/helm-charts/issues/141 apiVersion: "v2" appVersion: "1.2.5" dependencies: @@ -66,4 +66,4 @@ name: "nautobot" sources: - "https://github.com/nautobot/nautobot" - "https://github.com/nautobot/helm-charts" -version: "1.2.4" +version: "1.3.0" diff --git a/charts/nautobot/README.md b/charts/nautobot/README.md index 218e8502..b445f650 100644 --- a/charts/nautobot/README.md +++ b/charts/nautobot/README.md @@ -1,6 +1,6 @@ # nautobot -![Version: 1.2.4](https://img.shields.io/badge/Version-1.2.4-informational?style=flat-square) ![AppVersion: 1.2.5](https://img.shields.io/badge/AppVersion-1.2.5-informational?style=flat-square) +![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![AppVersion: 1.2.5](https://img.shields.io/badge/AppVersion-1.2.5-informational?style=flat-square) Nautobot is a Network Source of Truth and Network Automation Platform. @@ -931,6 +931,7 @@ helm delete nautobot | service.annotations | object | `{}` | Annotations to be applied to the service resource | | service.clusterIP | string | `nil` | IP address to use as the clusterIP | | service.externalTrafficPolicy | string | `"Cluster"` | Kubernetes externalTrafficPolicy valid values: `Cluster` or `Local` | +| service.extraPorts | list | `[]` | Extra ports to expose in the nautobot service (normally used with the `sidecars` value) | | service.httpsPort | int | `443` | Port to expose for Nautobot https access | | service.loadBalancerIP | string | `nil` | IP address to use as the loadBalancerIP | | service.loadBalancerSourceRanges | list | `[]` | List of allowed CIDRs to access the load balancer default 0.0.0.0/0, cloud provider dependent | diff --git a/charts/nautobot/templates/service.yaml b/charts/nautobot/templates/service.yaml index c963cd2a..a7251153 100644 --- a/charts/nautobot/templates/service.yaml +++ b/charts/nautobot/templates/service.yaml @@ -41,5 +41,8 @@ spec: {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePorts.http))) }} nodePort: {{ .Values.service.nodePorts.http }} {{- end }} + {{- if .Values.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }} + {{- end }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }} app.kubernetes.io/component: nautobot diff --git a/charts/nautobot/values.schema.json b/charts/nautobot/values.schema.json index 388c048f..3f0a1f0e 100644 --- a/charts/nautobot/values.schema.json +++ b/charts/nautobot/values.schema.json @@ -959,6 +959,7 @@ "required": [ "annotations", "externalTrafficPolicy", + "extraPorts", "httpsPort", "loadBalancerSourceRanges", "nodePorts", @@ -985,6 +986,13 @@ "pattern": "^(Cluster|Local)$", "description": "External Traffic Policy: https://kubernetes.io/docs/concepts/services-networking/service/" }, + "extraPorts": { + "type": "array", + "items": { + "type": "object" + }, + "description": "Extra ports to expose in the nautobot service (normally used with the `sidecars` value)" + }, "httpsPort": { "type": "integer", "minimum": 1, diff --git a/charts/nautobot/values.yaml b/charts/nautobot/values.yaml index a46f610c..9d05c8bb 100644 --- a/charts/nautobot/values.yaml +++ b/charts/nautobot/values.yaml @@ -26,6 +26,8 @@ service: externalTrafficPolicy: "Cluster" # -- Annotations to be applied to the service resource annotations: {} + # -- Extra ports to expose in the nautobot service (normally used with the `sidecars` value) + extraPorts: [] # Nautobot Server nautobot: