zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Agent][Deploy] - cmii update

Browse Source
This commit is contained in:
zeaslity
2024-06-12 14:09:49 +08:00
parent 4b782328db
commit f1fdfc7777
15 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-deploy/c_app/TemplateCmiiBackend.go
View File

@@ -43,7 +43,7 @@ spec:
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{- else }}
image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }}
image: {{ .HarborIP }}{{ .AppName }}:{{ .ImageTag }}
{{- end }}
imagePullPolicy: Always
env:

2
agent-deploy/c_app/TemplateCmiiFrontend.go
View File

@@ -33,7 +33,7 @@ spec:
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{- else }}
image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }}
image: {{ .HarborIP }}{{ .AppName }}:{{ .ImageTag }}
{{- end }}
imagePullPolicy: Always
env:

4
agent-deploy/c_app/TemplateIngressConfigMap.go
View File

@@ -10,7 +10,11 @@ data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "{{ .TenantEnv }}",
{{- if .WebPort }}
CloudHOST: "{{ .WebIP }}:{{ .WebPort }}",
{{- else }}
CloudHOST: "{{ .WebIP }}",
{{- end }}
{{- if eq .ShortName "pangu" }}
ApplicationShortName: "",
{{- else }}