Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move values to global #6

Merged
merged 1 commit into from
Nov 1, 2022
Merged

move values to global #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/istiod/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

configSources:
- address: k8s://
- address: {{ printf "xds://%s.%s:%s" .Values.higress.name .Values.higress.namespace .Values.higress.port }}
- address: {{ printf "xds://%s.%s:%s" .Values.global.higressName .Values.global.higressNamespace .Values.global.higressPort }}

defaultConfig:
{{- if .Values.global.meshID }}
Expand Down
4 changes: 2 additions & 2 deletions helm/istiod/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ spec:
timeoutSeconds: 5
env:
- name: HIGRESS_CONTROLLER_SVC
value: {{ printf "%s.%s" .Values.higress.name .Values.higress.namespace }}
value: {{ printf "%s.%s" .Values.global.higressName .Values.global.higressNamespace }}
- name: HIGRESS_CONTROLLER_PORT
value: "{{ .Values.higress.port }}"
value: "{{ .Values.global.higressPort }}"
- name: REVISION
value: "{{ .Values.revision | default `default` }}"
- name: JWT_POLICY
Expand Down
8 changes: 3 additions & 5 deletions helm/istiod/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
higress:
name: higress-controller
namespace: higress-system
port: "15051"

#.Values.pilot for discovery and mesh wide config

## Discovery Settings
Expand Down Expand Up @@ -226,6 +221,9 @@ meshConfig:
# No hurry to do this in 1.6, we're trying to prove the code.

global:
higressName: "higress-controller"
higressNamespace: "higress-system"
higressPort: "15051"
# Used to locate istiod.
istioNamespace: istio-system
# enable pod disruption budget for the control plane, which is used to
Expand Down