Merge pull request #2542 from YuleZ/hostAliases_for_enterprise-logs-s…

…imple [enterprise-logs-simple] Add host aliases
grafana · Sep 5, 2023 · aefeacd · aefeacd
2 parents 2e8f227 + 3fc5aef
commit aefeacd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/charts/enterprise-logs-simple/Chart.yaml b/charts/enterprise-logs-simple/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v2"
 name: "enterprise-logs-simple"
 type: application
-version: "1.2.1"
+version: "1.3.0"
 appVersion: "v1.4.0"
 kubeVersion: "^1.10.0-0"
 description: "DEPRECATED Grafana Enterprise Logs (Simple Scalable)"

diff --git a/charts/enterprise-logs-simple/templates/tokengen/job-tokengen.yaml b/charts/enterprise-logs-simple/templates/tokengen/job-tokengen.yaml
@@ -39,6 +39,10 @@ spec:
       {{- range .Values.image.pullSecrets }}
         - name: {{ . }}
       {{- end }}
+      {{- with .Values.tokengen.hostAliases }}
+      hostAliases:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- end }}
       initContainers:
         - name: enterprise-logs

diff --git a/charts/enterprise-logs-simple/values.yaml b/charts/enterprise-logs-simple/values.yaml
@@ -164,6 +164,11 @@ structuredConfig: {}
 tokengen:
   # -- Whether the job should be part of the deployment
   enable: true
+  # -- hostAliases to add
+  hostAliases: []
+  #  - ip: 1.2.3.4
+  #    hostnames:
+  #      - domain.tld
   # -- Name of the secret to store the admin token in
   adminTokenSecret: "gel-admin-token"
   # -- Additional CLI arguments for the `tokengen` target
@@ -209,7 +214,7 @@ loki-simple-scalable:
   # RBAC configuration
   rbac:
     # -- If enabled, a PodSecurityPolicy is created
-    pspEnabled: true
+    pspEnabled: false
 
   # -- Override gateway nginx.conf to include admin-api routes
   gateway:

diff --git a/ct.yaml b/ct.yaml
@@ -9,6 +9,6 @@ chart-repos:
   - elastic=https://helm.elastic.co
   - bitnami=https://charts.bitnami.com/bitnami
   - hashicorp=https://helm.releases.hashicorp.com
-  - minio=https://charts.min.io
+  - min.io=https://helm.min.io
 helm-extra-args: --timeout 600s
 validate-maintainers: false