Resolve "Set required labels for kiali (update to new umbrella pattern)"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ---
 
+## [1.0.1-bb.5] - 2024-08-23
+
+### Updated
+
+- Removed previous kiali label epic changes and updated to new pattern
+
 ## [1.0.1-bb.4] - 2024-07-26
 
 ### Added

README.md

 <!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
 # authservice
 
-![Version: 1.0.1-bb.4](https://img.shields.io/badge/Version-1.0.1--bb.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.1](https://img.shields.io/badge/AppVersion-1.0.1-informational?style=flat-square)
+![Version: 1.0.1-bb.5](https://img.shields.io/badge/Version-1.0.1--bb.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.1](https://img.shields.io/badge/AppVersion-1.0.1-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -11,7 +11,7 @@ A Helm chart for Kubernetes
 
 ### Upstream Release Notes
 
-- [Find upstream chart's release notes and CHANGELOG here](https://github.com/istio-ecosystem/authservice/releases)
+* [Find upstream chart's release notes and CHANGELOG here](https://github.com/istio-ecosystem/authservice/releases)
 
 ## Learn More
 * [Application Overview](docs/overview.md)
@@ -49,6 +49,7 @@ helm install authservice chart/
 | istio.hardened.kiali.namespaces[0] | string | `"kiali"` |  |
 | istio.hardened.kiali.principals[0] | string | `"cluster.local/ns/kiali/sa/kiali-service-account"` |  |
 | istio.namespace | string | `"istio-system"` |  |
+| istio.clusterWideHardeningEnabled | bool | `false` |  |
 | istio.mtls | object | `{"mode":"STRICT"}` | Default authservice peer authentication |
 | istio.mtls.mode | string | `"STRICT"` | Two mtls modes allowed STRICT = Allow only mutual TLS traffic PERMISSIVE = Allow both plain text and mutual TLS traffic |
 | monitoring.enabled | bool | `false` |  |
@@ -87,6 +88,7 @@ helm install authservice chart/
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
 | podAnnotations | object | `{}` |  |
+| podLabels | object | `{}` |  |
 | podSecurityContext.runAsUser | int | `1000` |  |
 | podSecurityContext.runAsGroup | int | `1000` |  |
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
@@ -115,15 +117,11 @@ helm install authservice chart/
 | redis-bb.image.pullSecrets[0] | string | `"private-registry"` |  |
 | redis-bb.networkPolicies.enabled | bool | `true` |  |
 | redis-bb.networkPolicies.controlPlaneCidr | string | `"0.0.0.0/0"` |  |
-| redis-bb.master.podLabels.app | string | `"authservice-authservice-redis-bb-master"` |  |
-| redis-bb.master.podLabels.version | string | `"{{ .Chart.AppVersion }}"` |  |
 | redis-bb.master.containerSecurityContext.enabled | bool | `true` |  |
 | redis-bb.master.containerSecurityContext.runAsUser | int | `1001` |  |
 | redis-bb.master.containerSecurityContext.runAsGroup | int | `1001` |  |
 | redis-bb.master.containerSecurityContext.runAsNonRoot | bool | `true` |  |
 | redis-bb.master.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
-| redis-bb.replica.podLabels.app | string | `"authservice-authservice-redis-bb-replica"` |  |
-| redis-bb.replica.podLabels.version | string | `"{{ .Chart.AppVersion }}"` |  |
 | redis-bb.replica.containerSecurityContext.enabled | bool | `true` |  |
 | redis-bb.replica.containerSecurityContext.runAsUser | int | `1001` |  |
 | redis-bb.replica.containerSecurityContext.runAsGroup | int | `1001` |  |

chart/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: 1.0.1-bb.4
+version: 1.0.1-bb.5
 
 # 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

chart/templates/bigbang/_helpers.tpl

-{{/*
-Bigbang labels
-*/}}
-{{- define "bigbang.labels" -}}
-app: {{ template "authservice.name" . }}
-{{- if .Chart.AppVersion }}
-version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-{{- end }}
\ No newline at end of file

chart/templates/deployment.yaml

@@ -21,7 +21,9 @@ spec:
         {{- end }}
       labels:
         {{- include "authservice.selectorLabels" . | nindent 8 }}
-        {{- include "bigbang.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- tpl (toYaml . | nindent 8) $ }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

chart/values.yaml

@@ -186,6 +186,7 @@ serviceAccount:
   name: ""
 
 podAnnotations: {}
+podLabels: {}
 
 podSecurityContext:
   runAsUser: 1000
@@ -260,9 +261,6 @@ redis-bb:
     enabled: true
     controlPlaneCidr: 0.0.0.0/0
   master:
-    podLabels:
-      app: authservice-authservice-redis-bb-master
-      version: "{{ .Chart.AppVersion }}"
     containerSecurityContext:
       enabled: true
       runAsUser: 1001
@@ -272,9 +270,6 @@ redis-bb:
         drop:
           - ALL
   replica:
-    podLabels:
-      app: authservice-authservice-redis-bb-replica
-      version: "{{ .Chart.AppVersion }}"
     containerSecurityContext:
       enabled: true
       runAsUser: 1001