fix: update API usage ingress condition (#171)

Author: dspo

charts/api7/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.17.10
+version: 0.17.11
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.17.10](https://img.shields.io/badge/Version-0.17.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.7.2.0](https://img.shields.io/badge/AppVersion-3.7.2-informational?style=flat-square)
+![Version: 0.17.11](https://img.shields.io/badge/Version-0.17.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.7.2.0](https://img.shields.io/badge/AppVersion-3.7.2-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 

charts/api7/templates/api-usage-ingress.yaml

@@ -1,4 +1,5 @@
-{{- if ((.Values.api_usage.service | default dict).ingress | default dict).enabled }}
+{{- if and (.Values.api_usage | default dict).enable .Values.api_usage.service }}
+{{- if ((.Values.api_usage.service.ingress | default dict).enabled | default false) }}
 {{- $fullName := printf "%s-api-usage" (include "api7ee3.fullname" .) -}}
 {{- $svcPort := .Values.api_usage.service.port -}}
 {{- if and .Values.api_usage.service.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
@@ -66,3 +67,4 @@ spec:
           {{- end }}
     {{- end }}
 {{- end }}
+{{- end }}