From 501e4b95db4f37fba411266ff24e7d7f460649b8 Mon Sep 17 00:00:00 2001 From: LETSGO Date: Wed, 8 Sep 2021 20:01:20 +0800 Subject: [PATCH] Update ingress-portal.yaml (#3933) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- CHANGES.md | 1 + scripts/helm/apollo-portal/templates/ingress-portal.yaml | 4 ++-- .../helm/apollo-service/templates/ingress-adminservice.yaml | 4 ++-- .../helm/apollo-service/templates/ingress-configservice.yaml | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4984124cfb9..dbeca07a728 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Apollo 1.9.1 ------------------ * [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/apolloconfig/apollo/milestone/9?closed=1) diff --git a/scripts/helm/apollo-portal/templates/ingress-portal.yaml b/scripts/helm/apollo-portal/templates/ingress-portal.yaml index 91b400f8fad..e444835526e 100644 --- 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 index bb3297dfa8c..aa76205eb9b 100644 --- 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 index 1d6699609a6..856a74ec713 100644 --- 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