Merge branch 'main' into update-permissions

kyverno · Feb 1, 2024 · d57a4e1 · d57a4e1
2 parents c7cdcc1 + 6675063
commit d57a4e1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/charts/reports-server/README.md b/charts/reports-server/README.md
@@ -56,7 +56,7 @@ helm install reports-server --namespace reports-server --create-namespace report
 | service.type | string | `"ClusterIP"` | Service type |
 | service.port | int | `443` | Service port |
 | config.debug | bool | `false` | Enable debug (to use inmemorydatabase) |
-| config.db.host | string | `"reports-server-postgresql"` | Database host |
+| config.db.host | string | `""` | Database host |
 | config.db.name | string | `"reportsdb"` | Database name |
 | config.db.user | string | `"postgres"` | Database user |
 | config.db.password | string | `"reports"` | Database password |

diff --git a/charts/reports-server/templates/api-service.yaml b/charts/reports-server/templates/api-service.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "reports-server.labels" . | nindent 4 }}
+    kube-aggregator.kubernetes.io/automanaged: "false"
 spec:
   group: wgpolicyk8s.io
   groupPriorityMinimum: 100
@@ -24,6 +25,7 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "reports-server.labels" . | nindent 4 }}
+    kube-aggregator.kubernetes.io/automanaged: "false"
 spec:
   group: reports.kyverno.io
   groupPriorityMinimum: 100

diff --git a/charts/reports-server/templates/deployment.yaml b/charts/reports-server/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reports-server.fullname" . }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "reports-server.labels" . | nindent 4 }}
 spec:
@@ -39,7 +40,11 @@ spec:
             {{- if .Values.config.debug }}
             - --debug
             {{- else }}
+            {{- if .Values.config.db.host }}
             - --dbhost={{ .Values.config.db.host }}
+            {{- else }}
+            - --dbhost={{ $.Release.Name }}-postgresql.{{ $.Release.Namespace }}
+            {{- end }}
             - --dbname={{ .Values.config.db.name }}
             - --dbuser={{ .Values.config.db.user }}
             - --dbpassword={{ .Values.config.db.password }}

diff --git a/charts/reports-server/values.yaml b/charts/reports-server/values.yaml
@@ -144,7 +144,7 @@ config:
   db:
 
     # -- Database host
-    host: reports-server-postgresql
+    host: ""
 
     # -- Database name
     name: reportsdb