Skip to content

Commit

Permalink
fix svc name
Browse files Browse the repository at this point in the history
  • Loading branch information
abusutil committed Aug 23, 2024
1 parent e9be1e7 commit 0eef377
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 0 deletions.
1 change: 1 addition & 0 deletions airbyte-webapp/.githooks/pre-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# Find the airbyte-webapp folder (which might be either inside oss/ or on the root)
if [ -d "./oss/airbyte-webapp" ]; then
webappDir="./oss/airbyte-webapp"
Expand Down
62 changes: 62 additions & 0 deletions charts/airbyte-workload-api-server/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
---
{{ if .Values.ingress.enabled -}}
{{- $fullName := include "airbyte.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
{{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
{{- end }}
{{- end }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "airbyte.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
ingressClassName: {{ .Values.ingress.className }}
{{- end }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ .path }}
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: {{ .pathType }}
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $.Release.Name }}-airbyte-workload-api-server-svc
port:
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }}-svc
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

0 comments on commit 0eef377

Please sign in to comment.