Update ingress-portal.yaml (#3933)

LETSGO · web-flow · commit ec9534f072e8 · 2021-09-08T20:01:20.000+08:00
* Update ingress-portal.yaml

-}} means whitespace to the right should be consumed，cause  error: 'apiVersion not set'. (#apiVersion annotated)

* Update ingress-adminservice.yaml

syntax error

* Update ingress-configservice.yaml

syntax error

* Update CHANGES.md
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,7 @@ Apollo 1.10.0
 * [Make Access Key Timestamp check configurable](https://github.com/ctripcorp/apollo/pull/3908)
 * [remove ctrip profile](https://github.com/ctripcorp/apollo/pull/3920)
 * [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937)
+* [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
diff --git a/scripts/helm/apollo-portal/templates/ingress-portal.yaml b/scripts/helm/apollo-portal/templates/ingress-portal.yaml
@@ -16,9 +16,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "apollo.portal.fullName" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{- else }}
 apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
diff --git a/scripts/helm/apollo-service/templates/ingress-adminservice.yaml b/scripts/helm/apollo-service/templates/ingress-adminservice.yaml
@@ -16,9 +16,9 @@
 {{- if .Values.adminService.ingress.enabled -}}
 {{- $fullName := include "apollo.adminService.fullName" . -}}
 {{- $svcPort := .Values.adminService.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{- else }}
 apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
diff --git a/scripts/helm/apollo-service/templates/ingress-configservice.yaml b/scripts/helm/apollo-service/templates/ingress-configservice.yaml
@@ -16,9 +16,9 @@
 {{- if .Values.configService.ingress.enabled -}}
 {{- $fullName := include "apollo.configService.fullName" . -}}
 {{- $svcPort := .Values.configService.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{- else }}
 apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
