diff --git a/agent-deploy/a_dashboard/TemplateK8SDashboard.go b/agent-deploy/a_dashboard/TemplateK8SDashboard.go index b7f8856..57b9f4d 100644 --- a/agent-deploy/a_dashboard/TemplateK8SDashboard.go +++ b/agent-deploy/a_dashboard/TemplateK8SDashboard.go @@ -179,7 +179,11 @@ spec: spec: containers: - name: kubernetes-dashboard + {{ if .HarborPort }} image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/dashboard:v2.0.1 + {{ else }} + image: {{ .HarborIP }}/cmii/dashboard:v2.0.1 + {{ end }} ports: - containerPort: 8443 protocol: TCP @@ -260,7 +264,11 @@ spec: spec: containers: - name: dashboard-metrics-scraper + {{ if .HarborPort }} image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/metrics-scraper:v1.0.4 + {{ else }} + image: {{ .HarborIP }}/cmii/metrics-scraper:v1.0.4 + {{ end }} ports: - containerPort: 8000 protocol: TCP diff --git a/agent-deploy/c_app/TemplateCmiiBackend.go b/agent-deploy/c_app/TemplateCmiiBackend.go index 08f1608..32b76a1 100644 --- a/agent-deploy/c_app/TemplateCmiiBackend.go +++ b/agent-deploy/c_app/TemplateCmiiBackend.go @@ -40,7 +40,11 @@ spec: - name: harborsecret containers: - name: {{ .AppName }} + {{ if .HarborPort }} image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }} + {{ else }} + image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }} + {{ end }} imagePullPolicy: Always env: - name: K8S_NAMESPACE diff --git a/agent-deploy/c_app/TemplateCmiiFrontend.go b/agent-deploy/c_app/TemplateCmiiFrontend.go index b85c7e9..1fadb22 100644 --- a/agent-deploy/c_app/TemplateCmiiFrontend.go +++ b/agent-deploy/c_app/TemplateCmiiFrontend.go @@ -30,7 +30,11 @@ spec: - name: harborsecret containers: - name: {{ .AppName }} + {{ if .HarborPort }} image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }} + {{ else }} + image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }} + {{ end }} imagePullPolicy: Always env: - name: K8S_NAMESPACE