-
Notifications
You must be signed in to change notification settings - Fork 210
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: merge with latest master changes, fix conflicts
- Loading branch information
Showing
7 changed files
with
202 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| {{- if (and .Values.control.enabled .Values.control.ingress.enabled) -}} | ||
| {{- $fullName := include "apisix.fullname" . -}} | ||
| {{- $svcPort := .Values.control.servicePort -}} | ||
| {{- if and .Values.control.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} | ||
| {{- if not (hasKey .Values.control.ingress.annotations "kubernetes.io/ingress.class") }} | ||
| {{- $_ := set .Values.control.ingress.annotations "kubernetes.io/ingress.class" .Values.control.ingress.className}} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.Version }} | ||
| apiVersion: networking.k8s.io/v1 | ||
| {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.Version }} | ||
| apiVersion: networking.k8s.io/v1beta1 | ||
| {{- else -}} | ||
| apiVersion: extensions/v1beta1 | ||
| {{- end }} | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ $fullName }}-control | ||
| labels: | ||
| {{- include "apisix.labels" . | nindent 4 }} | ||
| {{- with .Values.control.ingress.annotations }} | ||
| annotations: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- if and .Values.control.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} | ||
| ingressClassName: {{ .Values.control.ingress.className }} | ||
| {{- end }} | ||
| {{- if .Values.control.ingress.tls }} | ||
| tls: | ||
| {{- range .Values.control.ingress.tls }} | ||
| - hosts: | ||
| {{- range .hosts }} | ||
| - {{ . | quote }} | ||
| {{- end }} | ||
| secretName: {{ .secretName }} | ||
| {{- end }} | ||
| {{- end }} | ||
| rules: | ||
| {{- range .Values.control.ingress.hosts }} | ||
| - host: {{ .host | quote }} | ||
| http: | ||
| paths: | ||
| {{- range .paths }} | ||
| - path: {{ . }} | ||
| {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.Version }} | ||
| pathType: ImplementationSpecific | ||
| backend: | ||
| service: | ||
| name: {{ $fullName }}-control | ||
| port: | ||
| number: {{ $svcPort }} | ||
| {{- else }} | ||
| backend: | ||
| serviceName: {{ $fullName }}-control | ||
| servicePort: {{ $svcPort }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| {{ if (and .Values.apisix.enabled .Values.control.enabled) }} | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: {{ include "apisix.fullname" . }}-control | ||
| namespace: {{ .Release.Namespace }} | ||
| annotations: | ||
| {{- range $key, $value := .Values.control.service.annotations }} | ||
| {{ $key }}: {{ $value | quote }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "apisix.labels" . | nindent 4 }} | ||
| app.kubernetes.io/service: apisix-control | ||
| spec: | ||
| type: {{ .Values.control.service.type }} | ||
| {{- if eq .Values.control.service.type "LoadBalancer" }} | ||
| {{- if .Values.control.service.loadBalancerIP }} | ||
| loadBalancerIP: {{ .Values.control.service.loadBalancerIP }} | ||
| {{- end }} | ||
| {{- if .Values.control.service.loadBalancerSourceRanges }} | ||
| loadBalancerSourceRanges: | ||
| {{- range $cidr := .Values.control.service.loadBalancerSourceRanges }} | ||
| - {{ $cidr }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if gt (len .Values.control.service.externalIPs) 0 }} | ||
| externalIPs: | ||
| {{- range $ip := .Values.control.service.externalIPs }} | ||
| - {{ $ip }} | ||
| {{- end }} | ||
| {{- end }} | ||
| ports: | ||
| - name: apisix-control | ||
| port: {{ .Values.control.service.servicePort }} | ||
| targetPort: {{ .Values.control.service.port }} | ||
| {{- if (and (eq .Values.control.service.type "NodePort") (not (empty .Values.control.service.nodePort))) }} | ||
| nodePort: {{ .Values.control.service.nodePort }} | ||
| {{- end }} | ||
| protocol: TCP | ||
| selector: | ||
| {{- include "apisix.selectorLabels" . | nindent 4 }} | ||
| {{ end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters