-
-
Notifications
You must be signed in to change notification settings - Fork 10.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1. add context path and ingress support for config service and admin …
…service 2. allow users to override image tags
- Loading branch information
Showing
12 changed files
with
192 additions
and
21 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
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 |
|---|---|---|
| @@ -1,18 +1,32 @@ | ||
| Get meta service url for current release by running these commands: | ||
| Meta service url for current release: | ||
| {{- if contains "NodePort" .Values.configService.service.type }} | ||
| export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "apollo.configService.fullName" . }}) | ||
| export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") | ||
| echo http://$NODE_IP:$NODE_PORT | ||
| echo http://$NODE_IP:$NODE_PORT{{ .Values.configService.config.contextPath }} | ||
| {{- else if contains "LoadBalancer" .Values.configService.service.type }} | ||
| NOTE: It may take a few minutes for the LoadBalancer IP to be available. | ||
| You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "apollo.configService.fullName" . }}' | ||
| export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "apollo.configService.serviceName" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") | ||
| echo http://$SERVICE_IP:{{ .Values.service.port }} | ||
| echo http://$SERVICE_IP:{{ .Values.service.port }}{{ .Values.configService.config.contextPath }} | ||
| {{- else if contains "ClusterIP" .Values.configService.service.type }} | ||
| echo http://{{ include "apollo.configService.serviceName" .}}.{{ .Release.Namespace }}:{{ .Values.configService.service.port }} | ||
| echo {{ include "apollo.configService.serviceUrl" .}} | ||
|
|
||
| For local test use: | ||
| export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "apollo.configService.fullName" . }}" -o jsonpath="{.items[0].metadata.name}") | ||
| echo http://127.0.0.1:8080 | ||
| echo http://127.0.0.1:8080{{ .Values.configService.config.contextPath }} | ||
| kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:8080 | ||
| {{- end }} | ||
|
|
||
| {{- if .Values.configService.ingress.enabled }} | ||
|
|
||
| Ingress: | ||
| {{- range $host := .Values.configService.ingress.hosts }} | ||
| {{- range .paths }} | ||
| http{{ if $.Values.configService.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| Urls registered to meta service: | ||
| Config service: {{ include "apollo.configService.serviceUrl" .}} | ||
| Admin service: {{ include "apollo.adminService.serviceUrl" .}} |
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
41 changes: 41 additions & 0 deletions
41
scripts/helm/apollo-service/templates/ingress-adminservice.yaml
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,41 @@ | ||
| {{- if .Values.adminService.ingress.enabled -}} | ||
| {{- $fullName := include "apollo.adminService.fullName" . -}} | ||
| {{- $svcPort := .Values.adminService.service.port -}} | ||
| {{- 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 "apollo.service.labels" . | nindent 4 }} | ||
| {{- with .Values.adminService.ingress.annotations }} | ||
| annotations: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- if .Values.adminService.ingress.tls }} | ||
| tls: | ||
| {{- range .Values.adminService.ingress.tls }} | ||
| - hosts: | ||
| {{- range .hosts }} | ||
| - {{ . | quote }} | ||
| {{- end }} | ||
| secretName: {{ .secretName }} | ||
| {{- end }} | ||
| {{- end }} | ||
| rules: | ||
| {{- range .Values.adminService.ingress.hosts }} | ||
| - host: {{ .host | quote }} | ||
| http: | ||
| paths: | ||
| {{- range .paths }} | ||
| - path: {{ . }} | ||
| backend: | ||
| serviceName: {{ $fullName }} | ||
| servicePort: {{ $svcPort }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} |
41 changes: 41 additions & 0 deletions
41
scripts/helm/apollo-service/templates/ingress-configservice.yaml
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,41 @@ | ||
| {{- if .Values.configService.ingress.enabled -}} | ||
| {{- $fullName := include "apollo.configService.fullName" . -}} | ||
| {{- $svcPort := .Values.configService.service.port -}} | ||
| {{- 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 "apollo.service.labels" . | nindent 4 }} | ||
| {{- with .Values.configService.ingress.annotations }} | ||
| annotations: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- if .Values.configService.ingress.tls }} | ||
| tls: | ||
| {{- range .Values.configService.ingress.tls }} | ||
| - hosts: | ||
| {{- range .hosts }} | ||
| - {{ . | quote }} | ||
| {{- end }} | ||
| secretName: {{ .secretName }} | ||
| {{- end }} | ||
| {{- end }} | ||
| rules: | ||
| {{- range .Values.configService.ingress.hosts }} | ||
| - host: {{ .host | quote }} | ||
| http: | ||
| paths: | ||
| {{- range .paths }} | ||
| - path: {{ . }} | ||
| backend: | ||
| serviceName: {{ $fullName }} | ||
| servicePort: {{ $svcPort }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} |
Oops, something went wrong.