diff --git a/build/charts/yorkie-cluster/templates/istio/ingress.yaml b/build/charts/yorkie-cluster/templates/istio/ingress.yaml index 10e72aa4d..31e6759d8 100644 --- a/build/charts/yorkie-cluster/templates/istio/ingress.yaml +++ b/build/charts/yorkie-cluster/templates/istio/ingress.yaml @@ -3,17 +3,30 @@ kind: Ingress metadata: name: {{ .Values.yorkie.name }} namespace: {{ .Values.yorkie.namespace }} - {{ if .Values.ingress.alb.enabled }} + {{ if .Values.ingress.awsAlb.enabled }} annotations: alb.ingress.kubernetes.io/scheme: internet-facing - # Set alb.ingress.kubernetes.io/certificate-arn annotation to TLS certificate's ARN issued in AWS ACM - alb.ingress.kubernetes.io/certificate-arn: {{ .Values.ingress.alb.certArn }} + # Set alb.ingress.kubernetes.io/certificate-arn annotation to TLS certificate's ARN issued by AWS ACM + alb.ingress.kubernetes.io/certificate-arn: {{ .Values.ingress.awsAlb.certArn }} alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS": 443}]' alb.ingress.kubernetes.io/backend-protocol: HTTP alb.ingress.kubernetes.io/backend-protocol-version: HTTP2 alb.ingress.kubernetes.io/group.name: {{ .Values.ingress.hosts.apiHost }} alb.ingress.kubernetes.io/group.order: '10' {{ end }} + {{ if .Values.ingress.ncpAlb.enabled }} + annotations: + # Set alb.ingress.kubernetes.io/ssl-certificate-no annotation to TLS certificate's number issued by NCP + alb.ingress.kubernetes.io/ssl-certificate-no: {{ .Values.ingress.ncpAlb.certNo }} + alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80},{"HTTPS":443}]' + alb.ingress.kubernetes.io/ssl-redirect: "443" + alb.ingress.kubernetes.io/backend-protocol: HTTP + alb.ingress.kubernetes.io/enable-http2: "true" + # Set alb.ingress.kubernetes.io/healthcheck-path annotation to health check path in yorkie + # NCP ALB will use this path to check the health of the service + # If the health check fails, NCP ALB will not route the traffic to the service + alb.ingress.kubernetes.io/healthcheck-path: /healthz + {{ end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName }} rules: diff --git a/build/charts/yorkie-cluster/values.yaml b/build/charts/yorkie-cluster/values.yaml index 29a5b4a96..d1f726540 100644 --- a/build/charts/yorkie-cluster/values.yaml +++ b/build/charts/yorkie-cluster/values.yaml @@ -45,17 +45,21 @@ ingressGateway: # Configuration for ingress (eg: AWS ALB) ingress: ingressClassName: nginx - ## Set to alb if you are using AWS ALB + ## Set to alb if you are using AWS, NCP ALB # ingressClassName: alb hosts: enabled: false apiHost: api.yorkie.dev - alb: + awsAlb: enabled: false certArn: arn:aws:acm:ap-northeast-2:123412341234:certificate/1234-1234-1234-1234-1234 + ncpAlb: + enabled: false + certNo: 1234 + # Configuration for ratelimit ratelimit: enabled: false