diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a5922f0d..a26a11f1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,3 @@ -* @gls4 @jsbroks @nfoucha @vanpelt -/charts/launch-agent/ @bcsherma @KyleGoyette @TimH98 \ No newline at end of file +* @jsbroks @vanpelt +/charts/launch-agent/ @bcsherma @KyleGoyette @TimH98 +/charts/**/service.yaml @dacbd @zacharyblasczyk diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 5f5dbcbf..c144d371 100644 --- a/charts/operator-wandb/Chart.yaml +++ b/charts/operator-wandb/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: operator-wandb description: A Helm chart for deploying W&B to Kubernetes type: application -version: 0.25.0 +version: 0.25.1 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/charts/app/templates/service.yaml b/charts/operator-wandb/charts/app/templates/service.yaml index b9a24a3c..0fbb2b1d 100644 --- a/charts/operator-wandb/charts/app/templates/service.yaml +++ b/charts/operator-wandb/charts/app/templates/service.yaml @@ -29,7 +29,7 @@ metadata: prometheus.io/scrape: 'true' prometheus.io/path: '/metrics' prometheus.io/port: '8181' - {{- if and .Values.global.createGCPLoadBalancerBackend (eq .Values.global.cloudProvider "gcp") }} + {{- if eq .Values.global.cloudProvider "gcp" }} cloud.google.com/neg: '{"ingress": true}' cloud.google.com/backend-config: '{"default": "{{ $.Release.Name }}-app-backend-config"}' {{- end }} diff --git a/charts/operator-wandb/charts/console/templates/service.yaml b/charts/operator-wandb/charts/console/templates/service.yaml index b765ac3b..cfbfbb28 100644 --- a/charts/operator-wandb/charts/console/templates/service.yaml +++ b/charts/operator-wandb/charts/console/templates/service.yaml @@ -27,7 +27,7 @@ metadata: {{- toYaml .Values.service.labels | nindent 4 }} {{- end }} annotations: - {{- if and .Values.global.createGCPLoadBalancerBackend (eq .Values.global.cloudProvider "gcp") }} + {{- if eq .Values.global.cloudProvider "gcp" }} cloud.google.com/neg: '{"ingress": true}' cloud.google.com/backend-config: '{"default": "{{ $.Release.Name }}-console-backend-config"}' {{- end }} diff --git a/charts/operator-wandb/charts/weave-trace/templates/service.yaml b/charts/operator-wandb/charts/weave-trace/templates/service.yaml index d1ba58dd..9e4294be 100644 --- a/charts/operator-wandb/charts/weave-trace/templates/service.yaml +++ b/charts/operator-wandb/charts/weave-trace/templates/service.yaml @@ -1,3 +1,19 @@ +{{- if eq .Values.global.cloudProvider "gcp" }} +--- +apiVersion: cloud.google.com/v1 +kind: BackendConfig +metadata: + name: {{ .Release.Name }}-weave-trace-backend-config + labels: + {{- include "wandb.commonLabels" . | nindent 4 }} +spec: + {{- if .Values.global.gcpSecurityPolicy }} + securityPolicy: + name: {{ .Values.global.gcpSecurityPolicy }} + {{- end }} + timeoutSec: 120 +{{- end }} +--- apiVersion: v1 kind: Service metadata: @@ -13,6 +29,10 @@ metadata: {{- if eq .Values.global.cloudProvider "aws" }} alb.ingress.kubernetes.io/healthcheck-path: /traces/health {{- end }} + {{- if eq .Values.global.cloudProvider "gcp" }} + cloud.google.com/neg: '{"ingress": true}' + cloud.google.com/backend-config: '{"default": "{{ $.Release.Name }}-weave-trace-backend-config"}' + {{- end }} {{- if .Values.service.annotations -}} {{- toYaml .Values.service.annotations | nindent 4 }} {{- end }}