fix merge conflict

README.md

 <!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
 # vault
 
+<<<<<<< HEAD
 ![Version: 0.29.1-bb.0](https://img.shields.io/badge/Version-0.29.1--bb.0-informational?style=flat-square) ![AppVersion: 1.18.2](https://img.shields.io/badge/AppVersion-1.18.2-informational?style=flat-square) ![Maintenance Track: bb_integrated](https://img.shields.io/badge/Maintenance_Track-bb_integrated-green?style=flat-square)
+=======
+![Version: 0.29.0-bb.1](https://img.shields.io/badge/Version-0.29.0--bb.1-informational?style=flat-square) ![AppVersion: 1.18.1](https://img.shields.io/badge/AppVersion-1.18.1-informational?style=flat-square) ![Maintenance Track: bb_integrated](https://img.shields.io/badge/Maintenance_Track-bb_integrated-green?style=flat-square)
+>>>>>>> origin/main
 
 Official HashiCorp Vault Chart
 
 ## Upstream References
 - <https://www.vaultproject.io>
 
-* <https://github.com/hashicorp/vault>
-* <https://github.com/hashicorp/vault-helm>
-* <https://github.com/hashicorp/vault-k8s>
-* <https://github.com/hashicorp/vault-csi-provider>
+- <https://github.com/hashicorp/vault>
+- <https://github.com/hashicorp/vault-helm>
+- <https://github.com/hashicorp/vault-k8s>
+- <https://github.com/hashicorp/vault-csi-provider>
 
 ## Upstream Release Notes
 

chart/Chart.lock

 dependencies:
 - name: minio-instance
   repository: oci://registry1.dso.mil/bigbang
-  version: 6.0.4-bb.2
+  version: 6.0.4-bb.3
 - name: gluon
   repository: oci://registry1.dso.mil/bigbang
   version: 0.5.12

chart/Chart.yaml

@@ -23,7 +23,7 @@ sources:
   - https://github.com/hashicorp/vault-csi-provider
 dependencies:
   - name: minio-instance
-    version: 6.0.4-bb.2
+    version: 6.0.4-bb.3
     alias: minio
     condition: minio.enabled
     repository: oci://registry1.dso.mil/bigbang

chart/templates/csi-daemonset.yaml

@@ -14,6 +14,7 @@ metadata:
     app.kubernetes.io/name: {{ include "vault.name" . }}-csi-provider
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     {{- if  .Values.csi.daemonSet.extraLabels -}}
       {{- toYaml .Values.csi.daemonSet.extraLabels | nindent 4 -}}
     {{- end -}}
@@ -34,6 +35,7 @@ spec:
       labels:
         app.kubernetes.io/name: {{ template "vault.name" . }}-csi-provider
         app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/version: {{ .Chart.AppVersion }}
         {{- if  .Values.csi.pod.extraLabels -}}
           {{- tpl (toYaml .Values.csi.pod.extraLabels | nindent 8) . -}}
         {{- end -}}

chart/templates/injector-deployment.yaml

@@ -15,6 +15,7 @@ metadata:
     app.kubernetes.io/name: {{ include "vault.name" . }}-agent-injector
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     component: webhook
 spec:
   replicas: {{ .Values.injector.replicas }}
@@ -29,6 +30,7 @@ spec:
       labels:
         app.kubernetes.io/name: {{ template "vault.name" . }}-agent-injector
         app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/version: {{ .Chart.AppVersion }}
         component: webhook
         {{- if  .Values.injector.extraLabels -}}
           {{- tpl (toYaml .Values.injector.extraLabels | nindent 8) . -}}

chart/templates/server-statefulset.yaml

@@ -17,6 +17,7 @@ metadata:
     app.kubernetes.io/name: {{ include "vault.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
   {{- template "vault.statefulSet.annotations" . }}
 spec:
   serviceName: {{ template "vault.fullname" . }}-internal
@@ -38,6 +39,7 @@ spec:
         helm.sh/chart: {{ template "vault.chart" . }}
         app.kubernetes.io/name: {{ template "vault.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/version: {{ .Chart.AppVersion }}
         component: server
         {{- if .Values.server.extraLabels -}}
           {{- tpl (toYaml .Values.server.extraLabels | nindent 8) . -}}