diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml index 28f994f401..d753264689 100644 --- a/charts/fleet/Chart.yaml +++ b/charts/fleet/Chart.yaml @@ -4,7 +4,7 @@ name: fleet keywords: - fleet - osquery -version: v6.0.1 +version: v6.0.2 home: https://github.com/fleetdm/fleet sources: - https://github.com/fleetdm/fleet.git diff --git a/charts/fleet/templates/service.yaml b/charts/fleet/templates/service.yaml index 3003db6e9b..a04b0540dc 100644 --- a/charts/fleet/templates/service.yaml +++ b/charts/fleet/templates/service.yaml @@ -9,6 +9,9 @@ metadata: name: fleet namespace: {{ .Release.Namespace }} spec: + {{- if .Values.gke.ingress.useGKEIngress }} + type: NodePort + {{- end }} selector: app: fleet chart: fleet @@ -17,6 +20,8 @@ spec: ports: - name: fleet port: {{ .Values.fleet.listenPort }} - {{- if .Values.gke.ingress.useGKEIngress }} - type: NodePort - {{- end }} + {{- if .Values.gke.ingress.useGKEIngress }} + {{- if .Values.gke.ingress.nodePort }} + nodePort: {{ .Values.gke.ingress.nodePort }} + {{- end }} + {{- end }} diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml index 69620876c0..94cc00c864 100644 --- a/charts/fleet/values.yaml +++ b/charts/fleet/values.yaml @@ -191,6 +191,9 @@ gke: # The GKE Ingress requires a few changes that other ingress controllers don't ingress: useManagedCertificate: false + useGKEIngress: false + # 0 to allow the nodeport to be automatically selected, otherwise allowed range (30000-32767) + nodePort: 0 # Workload Identity allows the K8s service account to assume the IAM permissions of a GCP service account workloadIdentityEmail: ""