Release v2.1.3 (#415)

* chore(deps): update pre-commit hook norwoodj/helm-docs to v1.14.2 (#413) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix: remove unsupported lifecycle field from default initContainer (#412) * Fix nginx port mapping (#345) * Use other port name when enabling nginx * Revert "Use other port name when enabling nginx" This reverts commit 908f4a9. * Change target port when enabling nginx * Use oneliner * fix(deps): update dependency mkdocs-material to v9.5.28 (#401) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update docker.io/nginx/nginx-prometheus-exporter docker tag to v1.2.0 (#405) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update pre-commit hook streetsidesoftware/cspell-cli to v8.10.1 (#408) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update docker.io/nginxinc/nginx-unprivileged docker tag to v1.27 (#407) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update ghcr.io/nautobot/nautobot docker tag to v2.2.7 (#410) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update appany/helm-oci-chart-releaser action to v0.4.2 (#403) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Release 2.1.3 preparation (#414) * chore(docs): update release notes * chore: update dependencies and chart annotations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Danial Ebling <danialre@xmission.com> Co-authored-by: 2tefan <me@2tefan.eu>
nautobot · Jul 12, 2024 · 5b99565 · 5b99565
1 parent e584e23
commit 5b99565
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 39 deletions.
diff --git a/.github/workflows/release-chart.yaml b/.github/workflows/release-chart.yaml
@@ -19,7 +19,7 @@ jobs:
  runs-on: "ubuntu-22.04"
  steps:
  - name: "Publish Helm charts to OCI"
- uses: "appany/helm-oci-chart-releaser@v0.4.1"
+ uses: "appany/helm-oci-chart-releaser@v0.4.2"
  with:
  name: "nautobot"
  repository: "nautobot/helm-charts"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
  - "docs/"
 
  - repo: "https://github.com/streetsidesoftware/cspell-cli"
- rev: "v8.8.2"
+ rev: "v8.10.1"
  hooks:
  - id: "cspell"
 
@@ -73,7 +73,7 @@ repos:
  # - "console,checkov.sarif"
 
  - repo: "https://github.com/norwoodj/helm-docs"
- rev: "v1.13.1"
+ rev: "v1.14.2"
  hooks:
  - id: "helm-docs"
  args:
@@ -84,7 +84,7 @@ repos:
  - "--template-files=README.md.gotmpl"
 
  - repo: "https://github.com/norwoodj/helm-docs"
- rev: "v1.13.1"
+ rev: "v1.14.2"
  hooks:
  - id: "helm-docs"
  args:

diff --git a/charts/nautobot/Chart.lock b/charts/nautobot/Chart.lock
@@ -16,6 +16,6 @@ dependencies:
  version: 12.15.0
 - name: common
  repository: oci://registry-1.docker.io/bitnamicharts
- version: 2.19.2
-digest: sha256:cf14954d4eece195f0719a1b919964d2d70dd39ac8c0ae2e6d4629c94499fe44
-generated: "2024-05-13T13:03:35.824684885+03:00"
+ version: 2.20.3
+digest: sha256:488a07f67c7423babe00b85e9df488153bc4122d28adb0788bbe629ab7a46d6c
+generated: "2024-07-11T12:17:02.233751571+03:00"
diff --git a/charts/nautobot/Chart.yaml b/charts/nautobot/Chart.yaml
@@ -6,7 +6,7 @@ annotations:
  artifacthub.io/prerelease: "false"
  artifacthub.io/images: |
  - name: nautobot
- image: ghcr.io/nautobot/nautobot:2.2.5-py3.11
+ image: ghcr.io/nautobot/nautobot:2.2.7-py3.11
  artifacthub.io/links: |
  - name: Nautobot Documentation
  url: https://docs.nautobot.com/
@@ -30,21 +30,23 @@ annotations:
  - title: Chatops
  url: https://raw.githubusercontent.com/nautobot/nautobot/develop/nautobot/docs/media/ss_plugin_chatops.png
  artifacthub.io/changes: |
- - kind: added
- description: Added #391 option for persistent volume claim for media files
  - kind: fixed
- description: Fixed #398 documentation to include Persistent volume changes
+ description: Fixed unnecessary lifecycleHooks for Init Containers
+ - kind: fixed
+ description: Fixed Service's target port when Nginx in enabled
+ - kind: changed
+ description: Upgraded Nautobot from 2.2.5 to 2.2.7
  - kind: changed
- description: Upgraded Nautobot from 2.2.2 to 2.2.5
+ description: Upgraded Bitnami Common subchart from 2.19.2 to 2.20.3
  - kind: changed
- description: Upgraded nginx-prometheus-exporter image from 0.11.0 to 1.1.0
+ description: Upgraded nginx-prometheus-exporter image from 1.1.0 to 1.2.0
  - kind: changed
- description: Upgraded Bitnami Common subchart from 2.19.1 to 2.19.2
+ description: Upgraded dependency mkdocs-material from 9.5.22 to 9.5.28
  - kind: changed
- description: Upgraded dependency mkdocs-material from 9.5.18 to 9.5.22
+ description: Upgraded Nginx Unprivileged optional container from 1.26 to 1.27
 apiVersion: "v2"
-appVersion: "2.2.5"
-version: "2.1.2"
+appVersion: "2.2.7"
+version: "2.1.3"
 dependencies:
  - condition: "redis.enabled"
  name: "redis"

diff --git a/charts/nautobot/README.md b/charts/nautobot/README.md
@@ -1,6 +1,6 @@
 # nautobot
 
-![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![AppVersion: 2.2.5](https://img.shields.io/badge/AppVersion-2.2.5-informational?style=flat-square)
+![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![AppVersion: 2.2.7](https://img.shields.io/badge/AppVersion-2.2.7-informational?style=flat-square)
 
 Nautobot is a Network Source of Truth and Network Automation Platform.
 
@@ -215,7 +215,7 @@ The `mariadb.*` values configure the upstream chart from Bitnami. Please see th
 | <a name="metrics.nginxExporter.image.pullSecrets">[metrics.nginxExporter.image.pullSecrets](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L837)</a> | []string | `[]` | List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments |
 | <a name="metrics.nginxExporter.image.registry">[metrics.nginxExporter.image.registry](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L829)</a> | string | `"docker.io"` | NGINX Exporter image registry |
 | <a name="metrics.nginxExporter.image.repository">[metrics.nginxExporter.image.repository](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L831)</a> | string | `"nginx/nginx-prometheus-exporter"` | NGINX Exporter image name |
-| <a name="metrics.nginxExporter.image.tag">[metrics.nginxExporter.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L833)</a> | string | `"1.1.0"` | NGINX Exporter image tag |
+| <a name="metrics.nginxExporter.image.tag">[metrics.nginxExporter.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L833)</a> | string | `"1.2.0"` | NGINX Exporter image tag |
 | <a name="metrics.nginxExporter.livenessProbe">[metrics.nginxExporter.livenessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L866)</a> | [Probe](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1) | See values.yaml | [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX Exporter liveness probe |
 | <a name="metrics.nginxExporter.readinessProbe">[metrics.nginxExporter.readinessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L879)</a> | [Probe](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1) | See values.yaml | [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX Exporter readiness probe |
 | <a name="metrics.nginxExporter.resources">[metrics.nginxExporter.resources](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L856)</a> | [ResourceRequirements](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources) | See values.yaml | [[ref](http://kubernetes.io/docs/user-guide/compute-resources/)] NGINX Exporter resource requests and limits |
@@ -273,7 +273,7 @@ The `mariadb.*` values configure the upstream chart from Bitnami. Please see th
 | <a name="nautobot.image.pullSecrets">[nautobot.image.pullSecrets](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L48)</a> | []string | `[]` | List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments |
 | <a name="nautobot.image.registry">[nautobot.image.registry](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L40)</a> | string | `"ghcr.io"` | Nautobot image registry, common to all deployments |
 | <a name="nautobot.image.repository">[nautobot.image.repository](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L42)</a> | string | `"nautobot/nautobot"` | Nautobot image name, common to all deployments |
-| <a name="nautobot.image.tag">[nautobot.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L44)</a> | string | `"2.2.5-py3.11"` | Nautobot image tag, common to all deployments |
+| <a name="nautobot.image.tag">[nautobot.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L44)</a> | string | `"2.2.7-py3.11"` | Nautobot image tag, common to all deployments |
 | <a name="nautobot.initContainers">[nautobot.initContainers](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L204)</a> | [][Container](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Container) | `[]` | [[ref](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)] Add additional init containers to the Nautobot server pods |
 | <a name="nautobot.lifecycleHooks">[nautobot.lifecycleHooks](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L176)</a> | [Lifecycle](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle) | `{}` | lifecycleHooks for the Nautobot container(s) to automate configuration before or after startup |
 | <a name="nautobot.livenessProbe">[nautobot.livenessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L60)</a> | [Probe](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1) | See values.yaml | [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot liveness probe |
@@ -290,7 +290,7 @@ The `mariadb.*` values configure the upstream chart from Bitnami. Please see th
 | <a name="nautobot.nginx.image.pullSecrets">[nautobot.nginx.image.pullSecrets](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L289)</a> | []string | `[]` | List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments |
 | <a name="nautobot.nginx.image.registry">[nautobot.nginx.image.registry](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L281)</a> | string | `"docker.io"` | NGINX image registry |
 | <a name="nautobot.nginx.image.repository">[nautobot.nginx.image.repository](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L283)</a> | string | `"nginxinc/nginx-unprivileged"` | NGINX image name |
-| <a name="nautobot.nginx.image.tag">[nautobot.nginx.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L285)</a> | string | `"1.26"` | NGINX image tag |
+| <a name="nautobot.nginx.image.tag">[nautobot.nginx.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L285)</a> | string | `"1.27"` | NGINX image tag |
 | <a name="nautobot.nginx.lifecycleHooks">[nautobot.nginx.lifecycleHooks](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L295)</a> | [Lifecycle](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle) | `{}` | lifecycleHooks for the NGINX container(s) to automate configuration before or after startup |
 | <a name="nautobot.nginx.livenessProbe">[nautobot.nginx.livenessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L325)</a> | [Probe](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1) | See values.yaml | [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX liveness probe |
 | <a name="nautobot.nginx.readinessProbe">[nautobot.nginx.readinessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L337)</a> | [Probe](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1) | See values.yaml | [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX readiness probe |

diff --git a/charts/nautobot/charts/common-2.19.2.tgz b/charts/nautobot/charts/common-2.19.2.tgz
diff --git a/charts/nautobot/charts/common-2.20.3.tgz b/charts/nautobot/charts/common-2.20.3.tgz
diff --git a/charts/nautobot/templates/nautobot-deployment.yaml b/charts/nautobot/templates/nautobot-deployment.yaml
@@ -68,9 +68,6 @@ spec:
  - name: nautobot-init
  image: {{ include "nautobot.image" $ }}
  imagePullPolicy: {{ $nautobot.image.pullPolicy }}
- {{- if $nautobot.lifecycleHooks }}
- lifecycle: {{- include "common.tplvalues.render" (dict "value" $nautobot.lifecycleHooks "context" $) | nindent 12 }}
- {{- end }}
  {{- if $nautobot.containerSecurityContext.enabled }}
  securityContext: {{- omit $nautobot.containerSecurityContext "enabled" | toYaml | nindent 12 }}
  {{- end }}
@@ -154,9 +151,6 @@ spec:
  - name: nautobot-certs
  image: {{ include "nautobot.image" $ }}
  imagePullPolicy: {{ $nautobot.image.pullPolicy }}
- {{- if $nautobot.lifecycleHooks }}
- lifecycle: {{- include "common.tplvalues.render" (dict "value" $nautobot.lifecycleHooks "context" $) | nindent 12 }}
- {{- end }}
  command:
  - "/bin/bash"
  args:
@@ -359,9 +353,9 @@ spec:
  mountPath: "/opt/nautobot_certs"
  readOnly: true
  ports:
- - name: "https"
+ - name: "https-nginx"
  containerPort: 8443
- - name: "http"
+ - name: "http-nginx"
  containerPort: 8080
  - name: "metrics"
  containerPort: 8002

diff --git a/charts/nautobot/templates/service.yaml b/charts/nautobot/templates/service.yaml
@@ -32,14 +32,14 @@ spec:
  ports:
  - protocol: "TCP"
  port: {{ $.Values.service.httpsPort }}
- targetPort: "https"
+ targetPort: {{- if $nautobot.nginx.enabled }} "https-nginx" {{- else }} "https" {{- end }}
  name: "https"
  {{- if (and (eq $.Values.service.type "NodePort") (not (empty $.Values.service.nodePorts.https))) }}
  nodePort: {{ $.Values.service.nodePorts.https }}
  {{- end }}
  - protocol: "TCP"
  port: {{ $.Values.service.port }}
- targetPort: "http"
+ targetPort: {{- if $nautobot.nginx.enabled }} "http-nginx" {{- else }} "http" {{- end }}
  name: "http"
  {{- if (and (eq $.Values.service.type "NodePort") (not (empty $.Values.service.nodePorts.http))) }}
  nodePort: {{ $.Values.service.nodePorts.http }}

diff --git a/charts/nautobot/values.yaml b/charts/nautobot/values.yaml
@@ -41,7 +41,7 @@ nautobot:
  # -- Nautobot image name, common to all deployments
  repository: "nautobot/nautobot"
  # -- Nautobot image tag, common to all deployments
- tag: "2.2.5-py3.11"
+ tag: "2.2.7-py3.11"
  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/), common to all deployments valid values: `Always`, `Never`, or `IfNotPresent`
  pullPolicy: "Always"
  # -- ([]string) List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments
@@ -282,7 +282,7 @@ nautobot:
  # -- NGINX image name
  repository: "nginxinc/nginx-unprivileged"
  # -- NGINX image tag
- tag: "1.26"
+ tag: "1.27"
  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/), common to all deployments valid values: `Always`, `Never`, or `IfNotPresent`
  pullPolicy: "Always"
  # -- ([]string) List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments
@@ -830,7 +830,7 @@ metrics:
  # -- NGINX Exporter image name
  repository: "nginx/nginx-prometheus-exporter"
  # -- NGINX Exporter image tag
- tag: "1.1.0"
+ tag: "1.2.0"
  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/) valid values: `Always`, `Never`, or `IfNotPresent`
  pullPolicy: "Always"
  # -- ([]string) List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments