fix bug for mcr path in mooncake region

microsoft · Dec 7, 2023 · 0c22389 · 0c22389
1 parent a56c0e5
commit 0c22389
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/charts/azuremonitor-containers/README.md b/charts/azuremonitor-containers/README.md
@@ -85,7 +85,7 @@ The following table lists the configurable parameters of the MSOMS chart and the
 | -----------------------      | --------------------------------------------------------| --------------------------------------------------------------------------------------------------------------------------- |
 | `amalogs.image.tag`         | image tag for Linux Agent.                              | Most recent release                                                                                                         |
 | `amalogs.image.tagWindows`  | image tag for Windows Agent.                            | Most recent release                                                                                                         |
-| `amalogs.image.imagerepo`   | image repo for Liunx & Windows.                         | For Public and US Govt cloud: mcr.microsoft.com/azuremonitor/containerinsights/ciprod and For China Cloud: mcr.azk8s.cn/azuremonitor/containerinsights/ciprod
+| `amalogs.image.imagerepo`   | image repo for Liunx & Windows.                         | For Public, US Govt cloud and China Cloud: mcr.microsoft.com/azuremonitor/containerinsights/ciprod, and China Cloud will be redirected to mcr.azk8s.cn
 | `amalogs.image.pullPolicy`  | image pull policy for the agent.                        | IfNotPresent                                                                                                                |
 | `amalogs.secret.wsid`       | Azure Log analytics workspace id                        | Does not have a default value, needs to be provided                                                                         |
 | `amalogs.secret.key`        | Azure Log analytics workspace key                       | Does not have a default value, needs to be provided                                                                         |

diff --git a/charts/azuremonitor-containers/templates/ama-logs-daemonset-windows.yaml b/charts/azuremonitor-containers/templates/ama-logs-daemonset-windows.yaml
@@ -45,11 +45,7 @@ spec:
    {{- end }}
    containers:
      - name: ama-logs-windows
-       {{- if eq (.Values.amalogs.domain | lower) "opinsights.azure.cn" }}
-       image: "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:{{ .Values.amalogs.image.tagWindows }}"
-       {{- else }}
        image: {{ printf "%s:%s" .Values.amalogs.image.repo .Values.amalogs.image.tagWindows }}
-       {{- end }}
        imagePullPolicy: IfNotPresent
        resources:
 {{ toYaml .Values.amalogs.resources.daemonsetwindows | indent 9 }}

diff --git a/charts/azuremonitor-containers/templates/ama-logs-daemonset.yaml b/charts/azuremonitor-containers/templates/ama-logs-daemonset.yaml
@@ -48,11 +48,7 @@ spec:
 {{-  .Values.Azure.Identity.MSIAdapterYaml | nindent 7 }}
 {{- end }}
      - name: ama-logs
-       {{- if eq (.Values.amalogs.domain | lower) "opinsights.azure.cn" }}
-       image: "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:{{ .Values.amalogs.image.tag }}"
-       {{- else }}
        image: {{ printf "%s:%s" .Values.amalogs.image.repo .Values.amalogs.image.tag }}
-       {{- end }}
        imagePullPolicy: IfNotPresent
        resources:
 {{ toYaml .Values.amalogs.resources.daemonsetlinux | indent 9 }}
@@ -178,11 +174,7 @@ spec:
         timeoutSeconds: 15
    {{- if .Values.amalogs.sidecarscraping }}
      - name: ama-logs-prometheus
-       {{- if eq (.Values.amalogs.domain | lower) "opinsights.azure.cn" }}
-       image: "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:{{ .Values.amalogs.image.tag }}"
-       {{- else }}
        image: {{ printf "%s:%s" .Values.amalogs.image.repo .Values.amalogs.image.tag }}
-       {{- end }}
        imagePullPolicy: IfNotPresent
        resources:
 {{ toYaml .Values.amalogs.resources.daemonsetlinuxsidecar | indent 9 }}

diff --git a/charts/azuremonitor-containers/templates/ama-logs-deployment.yaml b/charts/azuremonitor-containers/templates/ama-logs-deployment.yaml
@@ -44,11 +44,7 @@ spec:
 {{-  .Values.Azure.Identity.MSIAdapterYaml | nindent 7 }}
 {{- end }}
      - name: ama-logs
-       {{- if  eq (.Values.amalogs.domain | lower) "opinsights.azure.cn" }}
-       image: "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:{{ .Values.amalogs.image.tag }}"
-       {{- else }}
        image: {{ printf "%s:%s" .Values.amalogs.image.repo .Values.amalogs.image.tag }}
-       {{- end }}
        imagePullPolicy: IfNotPresent
        resources:
 {{ toYaml .Values.amalogs.resources.deployment | indent 9 }}