Fix issue in console helm chart

deepfence · Feb 26, 2024 · f32ad5a · f32ad5a
1 parent 318fcc1
commit f32ad5a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/deployment-scripts/helm-charts/deepfence-console/Chart.yaml b/deployment-scripts/helm-charts/deepfence-console/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: deepfence-console
 description: A Helm chart for Kubernetes
 type: application
-version: 2.1.2
+version: 2.1.3
 appVersion: 2.1.1
diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/NOTES.txt b/deployment-scripts/helm-charts/deepfence-console/templates/NOTES.txt
@@ -1,10 +1,6 @@
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.host }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
+  https://{{ .Values.ingress.host }}/
 {{- else if contains "NodePort" .Values.router.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "deepfence-console.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")

diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router-ingress.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingress.enable }}
+{{- if .Values.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router.yaml
@@ -111,7 +111,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
 ---
-{{- if or .Values.router.service.create .Values.ingress.enable }}
+{{- if or .Values.router.service.create .Values.ingress.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/deployment-scripts/helm-charts/deepfence-console/values.yaml b/deployment-scripts/helm-charts/deepfence-console/values.yaml
@@ -223,14 +223,16 @@ neo4j:
   affinity: {}
   podLabels: {}
 
+# DO NOT USE
+# Use deepfence-router helm chart to configure the service and ingress
 # ingress for console
 ingress:
-  enable: false
+  enabled: true
   ## name of the ingress class for ingress provider installed on the cluster, cannot be empty
   ## Example: nginx
   class: nginx
   ## host example: threat.example.com
-  host: ""
+  host: "dd.deep.com"
   ## annotations to customize ingress
   annotations:
     ## nginx ingress annotations

diff --git a/deployment-scripts/helm-charts/index.yaml b/deployment-scripts/helm-charts/index.yaml
@@ -3,7 +3,7 @@ entries:
   deepfence-agent:
   - apiVersion: v2
     appVersion: 2.1.1
-    created: "2024-02-21T13:04:13.335519+05:30"
+    created: "2024-02-26T14:59:02.364086+05:30"
     description: Deepfence Agent - Helm chart for Kubernetes
     digest: 31587b4e1e4289408d1b0d01c6e0576b2968c6570d59f4449f262b07146920b9
     name: deepfence-agent
@@ -252,6 +252,16 @@ entries:
     - deepfence-agent-1.0.0.tgz
     version: 1.0.0
   deepfence-console:
+  - apiVersion: v2
+    appVersion: 2.1.1
+    created: "2024-02-26T14:59:02.365414+05:30"
+    description: A Helm chart for Kubernetes
+    digest: 41f19ba850e336b18d6b5089e48ec763b8f2669c62d56d868c5893d460d9d31a
+    name: deepfence-console
+    type: application
+    urls:
+    - deepfence-console-2.1.3.tgz
+    version: 2.1.3
   - apiVersion: v2
     appVersion: 2.1.1
     created: "2024-02-21T13:04:13.33696+05:30"
@@ -505,7 +515,7 @@ entries:
   deepfence-router:
   - apiVersion: v2
     appVersion: 2.1.1
-    created: "2024-02-21T13:04:13.337293+05:30"
+    created: "2024-02-26T14:59:02.365991+05:30"
     description: Deepfence Router - Helm chart for Kubernetes
     digest: 3dc76a04b63e8b93dd474453bdf638d9eeef5f13aeaf0a3cc91c0c742d4275d3
     name: deepfence-router
@@ -653,4 +663,4 @@ entries:
     urls:
     - deepfence-router-1.0.0.tgz
     version: 1.0.0
-generated: "2024-02-21T13:04:13.334446+05:30"
+generated: "2024-02-26T14:59:02.363289+05:30"