Move loadbalancer code to OSDFIR and remove from sub charts to de dup…

…licate code

charts/osdfir-infrastructure/charts/timesketch/templates/NOTES.txt

@@ -8,9 +8,6 @@ To learn more about the release, try:
   $ kubectl get pods
 
 To connect to the Timesketch URL:
-  {{- if and (.Values.ingress.enabled) (.Values.ingress.host) }}
-  $ echo "Visit https://{{ .Values.ingress.host }} to access Timesketch externally"
-  {{- end }}
   $ kubectl --namespace {{ .Release.Namespace }} port-forward service/{{ .Release.Name }}-timesketch 5000:5000
   $ echo "Visit http://127.0.0.1:5000 to access Timesketch through port-forwarding"
 

charts/osdfir-infrastructure/charts/timesketch/templates/gcp/backendconfig.yaml

@@ -1,4 +1,4 @@
-{{- if or (and (.Values.ingress.enabled) (eq .Values.ingress.className "gce")) (and (.Values.global.ingress.enabled) (eq .Values.global.ingress.className "gce")) }}
+{{- if (and (.Values.global.ingress.enabled) (eq .Values.global.ingress.className "gce")) }}
 apiVersion: cloud.google.com/v1
 kind: BackendConfig
 metadata:

charts/osdfir-infrastructure/charts/timesketch/templates/nginx/nginx-configmap.yaml

@@ -1,4 +1,4 @@
-{{- if or (.Values.ingress.enabled) (.Values.global.ingress.enabled) -}}
+{{- if (.Values.global.ingress.enabled) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/osdfir-infrastructure/charts/timesketch/templates/nginx/nginx-deployment.yaml

@@ -1,4 +1,4 @@
-{{- if or (.Values.ingress.enabled) (.Values.global.ingress.enabled) -}}
+{{- if (.Values.global.ingress.enabled) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

charts/osdfir-infrastructure/charts/timesketch/templates/nginx/nginx-service.yaml

@@ -1,12 +1,12 @@
-{{- if or (.Values.ingress.enabled) (.Values.global.ingress.enabled) -}}
+{{- if (.Values.global.ingress.enabled) -}}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-timesketch-nginx
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "timesketch.labels" . | nindent 4 }}
-  {{- if or (eq .Values.ingress.className "gce") (eq .Values.global.ingress.className "gce") }}
+  {{- if (eq .Values.global.ingress.className "gce") }}
   annotations:
     cloud.google.com/neg: '{"ingress": true}'
     cloud.google.com/backend-config: '{"ports": {"8080":"{{ .Release.Name }}-timesketch-backend-config"}}'

charts/osdfir-infrastructure/charts/timesketch/values.yaml

@@ -5,34 +5,18 @@
 ## Please, note that this will override the parameters configured to use the global value
 ##
 global:
-  ## Global Persistence Configuration
-  ##
   timesketch:
     ## @param global.timesketch.enabled Enables the Timesketch deployment (only used in the main OSDFIR Infrastructure Helm chart)
     ##
     enabled: false
-    ## @param global.timesketch.servicePort Timesketch service port (overrides `timesketch.service.port`)
-    ##
-    servicePort:
   yeti:
     ## @param global.yeti.enabled Enables the Yeti deployment (only used in the main OSDFIR Infrastructure Helm chart)
     ##
     enabled: false
-    ## @param global.yeti.servicePort Yeti API service port (overrides `yeti.api.service.port`)
-    ##
-    servicePort:
-  ## Global ingress parameters used to configure Turbinia, Timesketch, Yeti under a single loadbalancer
-  ##
   ingress:
     ## @param global.ingress.enabled Enable the global loadbalancer for external access (only used in the main OSDFIR Infrastructure Helm chart)
     ##
     enabled: false
-  ## @param global.existingPVC Existing claim for Timesketch persistent volume (overrides `persistent.name`)
-  ##
-  existingPVC: ""
-  ## @param global.storageClass StorageClass for the Timesketch persistent volume (overrides `persistent.storageClass`)
-  ##
-  storageClass: ""
 ## @section Timesketch image configuration
 ##
 image:
@@ -183,42 +167,6 @@ securityContext:
   ## @param securityContext.enabled Enable SecurityContext for Timesketch pods
   ##
   enabled: true
-## Ingress Parameters
-##
-ingress:
-  ## @param ingress.enabled Enable the Timesketch loadbalancer for external access
-  ##
-  enabled: false
-  ## @param ingress.host Domain name Timesketch will be hosted under
-  ## Please ensure you have a DNS record set for the IP address registered under
-  ## ingress.gcp.staticIPName
-  ##
-  host: ""
-  ## @param ingress.className IngressClass that will be be used to implement the Ingress
-  ## ref https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/
-  ##
-  className: ""
-  ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm
-  ##
-  selfSigned: false
-  ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
-  ##
-  certManager: false
-  ## GCP ingress configuration
-  ##
-  gcp:
-    ## @param ingress.gcp.managedCertificates Enables GCP managed certificates for your domain
-    ## ref https://cloud.google.com/load-balancing/docs/ssl-certificates/google-managed-certs
-    ##
-    managedCertificates: false
-    ## @param ingress.gcp.staticIPName Name of the static IP address you reserved in GCP.
-    ## ref https://cloud.google.com/compute/docs/ip-addresses/reserve-static-external-ip-address
-    ##
-    staticIPName: ""
-    ## @param ingress.gcp.staticIPV6Name Name of the static IPV6 address you reserved. This can be optionally provided to deploy a loadbalancer with an IPV6 address in GCP.
-    ## ref https://cloud.google.com/compute/docs/ip-addresses/reserve-static-external-ip-address
-    ##
-    staticIPV6Name: ""
 ## @section Third Party Configuration
 ## This section contains all the main configuration for third party dependencies Timesketch needs to run
 ##

charts/osdfir-infrastructure/charts/yeti/templates/NOTES.txt

@@ -8,9 +8,6 @@ To learn more about the release, try:
   $ kubectl get pods
 
 To connect to the Yeti URL, run:
-  {{- if and (.Values.ingress.enabled) (.Values.ingress.host) }}
-  $ echo "Visit https://{{ .Values.ingress.host }} to access Yeti externally"
-  {{- end }}
   $ kubectl --namespace {{ .Release.Namespace }} port-forward service/{{ .Release.Name }}-yeti 9000:9000
   $ echo "Visit http://127.0.0.1:9000 to access Yeti through port-forwarding"
 

charts/osdfir-infrastructure/charts/yeti/templates/gcp/backendconfig.yaml

@@ -1,4 +1,4 @@
-{{- if or (and (.Values.ingress.enabled) (eq .Values.ingress.className "gce")) (and (.Values.global.ingress.enabled) (eq .Values.global.ingress.className "gce")) }}
+{{- if (and (.Values.global.ingress.enabled) (eq .Values.global.ingress.className "gce")) }}
 apiVersion: cloud.google.com/v1
 kind: BackendConfig
 metadata: