Skip to content

fix(account-service): add ingress resource adoption and create instal… #6832

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

Merged
zjy365 merged 2 commits into from
Mar 25, 2026
Merged

fix(account-service): add ingress resource adoption and create instal… #6832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a717de1
fix(account-service): add ingress resource adoption and create instal…
cuisongliu Mar 25, 2026
08420da
fix(config): add support for allowedAllOrigins in configmap and values
cuisongliu Mar 25, 2026
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
1 change: 1 addition & 0 deletions controllers/license/deploy/license-controller-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ kubectl delete rolebinding license-leader-election-rolebinding -n account-system
kubectl delete clusterrole license-manager-role --ignore-not-found
kubectl delete clusterrole license-metrics-reader --ignore-not-found
kubectl delete clusterrole license-proxy-role --ignore-not-found
kubectl delete clusterrole license-controller-clusterrole --ignore-not-found
kubectl delete role license-leader-election-role -n account-system --ignore-not-found
kubectl delete serviceaccount license-controller-manager -n account-system --ignore-not-found
helm upgrade -i license -n license-system --create-namespace ./charts/license-controller ${HELM_OPTS}
Expand Down
5 changes: 5 additions & 0 deletions frontend/desktop/deploy/charts/desktop-frontend/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ data:
regionUID: "{{ .Values.desktopConfig.regionUID }}"
certSecretName: "{{ .Values.desktopConfig.certSecretName }}"
proxyDomain: "{{ .Values.desktopConfig.cloudDomain }}"
allowedAllOrigins: {{ .Values.desktopConfig.allowedAllOrigins | default false }}
allowedOrigins:
{{- if .Values.desktopConfig.allowedAllOrigins }}
- "*"
{{- else }}
{{- $defaultAllowedOrigins := list "costcenter" "license" -}}
{{- $allowedOrigins := .Values.desktopConfig.allowedOrigins | default $defaultAllowedOrigins -}}
{{- range $origin := $allowedOrigins }}
- "https://{{ $origin }}.{{ $.Values.desktopConfig.cloudDomain }}"
{{- end }}
{{- end }}

common:
Expand Down
1 change: 1 addition & 0 deletions frontend/desktop/deploy/charts/desktop-frontend/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ desktopConfig:
billingUrl: "http://account-service.account-system.svc:2333"
billingToken: ""

allowedAllOrigins: false
allowedOrigins:
- "costcenter"
- "license"
Expand Down
2 changes: 2 additions & 0 deletions frontend/providers/license/deploy/Kubefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ USER 65532:65532
COPY registry registry
COPY manifests manifests

COPY install.sh install.sh

ENV certSecretName="wildcard-cert"
ENV cloudDomain="127.0.0.1.nip.io"
ENV cloudPort=""
Expand Down
4 changes: 4 additions & 0 deletions frontend/providers/license/deploy/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

kubectl delete clusterrolebinding license-frontend-role-binding --ignore-not-found
kubectl apply -f manifests
1 change: 1 addition & 0 deletions service/account/deploy/account-service-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if ! helm status "${RELEASE_NAME}" -n "${RELEASE_NAMESPACE}" >/dev/null 2>&1; th
adopt_namespaced_resource configmap region-info
adopt_namespaced_resource service account-service
adopt_namespaced_resource deployment account-service
adopt_namespaced_resource ingress account-service
fi

# Build helm set args from ConfigMap
Expand Down
Loading