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

[agent-deploy] - support for inner cmiii harbor image

Browse Source
This commit is contained in:
zeaslity
2024-06-11 15:23:03 +08:00
parent 4d44a9eac1
commit cb3daa503a
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
agent-deploy/a_dashboard/TemplateK8SDashboard.go
View File

@@ -179,7 +179,11 @@ spec:
spec: spec:
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
{{ if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/dashboard:v2.0.1 image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/dashboard:v2.0.1
{{ else }}
image: {{ .HarborIP }}/cmii/dashboard:v2.0.1
{{ end }}
ports: ports:
- containerPort: 8443 - containerPort: 8443
protocol: TCP protocol: TCP
@@ -260,7 +264,11 @@ spec:
spec: spec:
containers: containers:
- name: dashboard-metrics-scraper - name: dashboard-metrics-scraper
{{ if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/metrics-scraper:v1.0.4 image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/metrics-scraper:v1.0.4
{{ else }}
image: {{ .HarborIP }}/cmii/metrics-scraper:v1.0.4
{{ end }}
ports: ports:
- containerPort: 8000 - containerPort: 8000
protocol: TCP protocol: TCP

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

@@ -40,7 +40,11 @@ spec:
- name: harborsecret - name: harborsecret
containers: containers:
- name: {{ .AppName }} - name: {{ .AppName }}
{{ if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }} image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ else }}
image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ end }}
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: K8S_NAMESPACE - name: K8S_NAMESPACE

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

@@ -30,7 +30,11 @@ spec:
- name: harborsecret - name: harborsecret
containers: containers:
- name: {{ .AppName }} - name: {{ .AppName }}
{{ if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }} image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ else }}
image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ end }}
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: K8S_NAMESPACE - name: K8S_NAMESPACE