fix: route minio requests through ambassador (#7)

Author: lucaspin

helm-chart/templates/emissary-ingress/mappings.yaml

@@ -531,3 +531,63 @@ spec:
   service: self-hosted-hub-public-api.{{ .Release.Namespace }}:8000
   timeout_ms: 30000
   precedence: 100
+{{- if .Values.global.artifacts.local.enabled }}
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: minio-artifacts-mapping
+  namespace: {{ .Release.Namespace }}
+spec:
+  host: "^artifacts\\..*"
+  host_regex: true
+  prefix: /
+  rewrite: ""
+  service: minio-artifacts.{{ .Release.Namespace }}:9000
+  timeout_ms: 30000
+  bypass_auth: true
+  envoy_override:
+    retry_policy:
+      retry_on: connect-failure
+      num_retries: 3
+{{- end }}
+{{- if .Values.global.cache.local.enabled }}
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: minio-cache-mapping
+  namespace: {{ .Release.Namespace }}
+spec:
+  host: "^cache\\..*"
+  host_regex: true
+  prefix: /
+  rewrite: ""
+  service: minio-cache.{{ .Release.Namespace }}:9000
+  timeout_ms: 30000
+  bypass_auth: true
+  envoy_override:
+    retry_policy:
+      retry_on: connect-failure
+      num_retries: 3
+{{- end }}
+{{- if .Values.global.logs.local.enabled }}
+---
+apiVersion: getambassador.io/v3alpha1
+kind: Mapping
+metadata:
+  name: minio-logs-mapping
+  namespace: {{ .Release.Namespace }}
+spec:
+  host: "^logs\\..*"
+  host_regex: true
+  prefix: /
+  rewrite: ""
+  service: minio-logs.{{ .Release.Namespace }}:9000
+  timeout_ms: 30000
+  bypass_auth: true
+  envoy_override:
+    retry_policy:
+      retry_on: connect-failure
+      num_retries: 3
+{{- end }}

helm-chart/templates/ingress.yaml

@@ -48,36 +48,6 @@ spec:
       port:
         number: 8080
   rules:
-  - host: "artifacts.{{ $domainName }}"
-    http:
-      paths:
-      - backend:
-          service:
-            name: minio-artifacts
-            port:
-              number: 9000
-        path: /
-        pathType: Prefix
-  - host: "cache.{{ $domainName }}"
-    http:
-      paths:
-      - backend:
-          service:
-            name: minio-cache
-            port:
-              number: 9000
-        path: /
-        pathType: Prefix
-  - host: "logs.{{ $domainName }}"
-    http:
-      paths:
-      - backend:
-          service:
-            name: minio-logs
-            port:
-              number: 9000
-        path: /
-        pathType: Prefix
   - host: "*.{{ $domainName }}"
     http:
       paths:

helm-chart/templates/minio/artifacts.yaml

@@ -20,11 +20,6 @@ metadata:
   labels:
     app: minio-artifacts
     product: semaphoreci
-{{- if eq .Values.ingress.className "gce" }}
-  annotations:
-    cloud.google.com/backend-config: '{"ports": {"9000":"minio-artifacts-backend-config"}}'
-    cloud.google.com/neg: '{"ingress": true}'
-{{- end }}
 spec:
   type: ClusterIP
   ports:
@@ -87,26 +82,4 @@ spec:
       resources:
         requests:
           storage: {{ .Values.global.artifacts.local.size }}
----
-{{- if .Values.ingress.enabled }}
-{{- if eq .Values.ingress.className "gce" }}
-apiVersion: cloud.google.com/v1
-kind: BackendConfig
-metadata:
-  name: minio-artifacts-backend-config
-  namespace: {{ .Release.Namespace }}
-spec:
-  timeoutSec: 30
-  connectionDraining:
-    drainingTimeoutSec: 30
-  logging:
-    enable: true
-  healthCheck:
-    checkIntervalSec: 10
-    timeoutSec: 10
-    port: 9000
-    type: HTTP
-    requestPath: /minio/health/live
-{{- end }}
-{{- end }}
 {{- end }}

helm-chart/templates/minio/cache.yaml

@@ -7,11 +7,6 @@ metadata:
   labels:
     app: minio-cache
     product: semaphoreci
-{{- if eq .Values.ingress.className "gce" }}
-  annotations:
-    cloud.google.com/backend-config: '{"ports": {"9000":"minio-cache-backend-config"}}'
-    cloud.google.com/neg: '{"ingress": true}'
-{{- end }}
 spec:
   type: ClusterIP
   ports:
@@ -74,26 +69,4 @@ spec:
       resources:
         requests:
           storage: {{ .Values.global.cache.local.size }}
----
-{{- if .Values.ingress.enabled }}
-{{- if eq .Values.ingress.className "gce" }}
-apiVersion: cloud.google.com/v1
-kind: BackendConfig
-metadata:
-  name: minio-cache-backend-config
-  namespace: {{ .Release.Namespace }}
-spec:
-  timeoutSec: 30
-  connectionDraining:
-    drainingTimeoutSec: 30
-  logging:
-    enable: true
-  healthCheck:
-    checkIntervalSec: 10
-    timeoutSec: 10
-    port: 9000
-    type: HTTP
-    requestPath: /minio/health/live
-{{- end }}
-{{- end }}
 {{- end }}

helm-chart/templates/minio/logs.yaml

@@ -20,11 +20,6 @@ metadata:
   labels:
     app: minio-logs
     product: semaphoreci
-{{- if eq .Values.ingress.className "gce" }}
-  annotations:
-    cloud.google.com/backend-config: '{"ports": {"9000":"minio-logs-backend-config"}}'
-    cloud.google.com/neg: '{"ingress": true}'
-{{- end }}
 spec:
   type: ClusterIP
   ports:
@@ -87,26 +82,4 @@ spec:
       resources:
         requests:
           storage: {{ .Values.global.logs.local.size }}
----
-{{- if .Values.ingress.enabled }}
-{{- if eq .Values.ingress.className "gce" }}
-apiVersion: cloud.google.com/v1
-kind: BackendConfig
-metadata:
-  name: minio-logs-backend-config
-  namespace: {{ .Release.Namespace }}
-spec:
-  timeoutSec: 30
-  connectionDraining:
-    drainingTimeoutSec: 30
-  logging:
-    enable: true
-  healthCheck:
-    checkIntervalSec: 10
-    timeoutSec: 10
-    port: 9000
-    type: HTTP
-    requestPath: /minio/health/live
-{{- end }}
-{{- end }}
 {{- end }}