Merge remote-tracking branch 'origin/main'

Author: CodeCook83

charts/python-app/values.yaml

@@ -2,9 +2,14 @@ replicaCount: 1
 image:
   repository: codecook83/python-app
   pullPolicy: IfNotPresent
+<<<<<<< HEAD
   tag: ea0b5e
 imagePullSecrets:
   - name: dockerhub-cred
+=======
+  tag: b7c7d0
+imagePullSecrets: []
+>>>>>>> origin/main
 nameOverride: ""
 fullnameOverride: ""
 podAnnotations: {}