Merge branch 'ci_prod' into gangams/mdsd-update-fips-compliant

microsoft · Dec 9, 2023 · 1cec05d · 1cec05d
2 parents 522eead + e8bf60d
commit 1cec05d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 22 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -9,9 +9,9 @@ additional questions or comments.
 
 ## Release History
 
-### 11/29/2023 -
-##### Version microsoft/oms:3.1.15 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.1.16 (linux)
-##### Version microsoft/oms:win-3.1.15 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.15 (windows)
+### 12/08/2023 -
+##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.1.16 (linux)
+##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.15 (windows)
 ##### Release branch: https://github.com/microsoft/Docker-Provider/commits/user/amagraw/3.1.16
 ##### Commit: https://github.com/microsoft/Docker-Provider/commit/7b7335d94a436b086c8fe2a8c883b865deae3990
 ##### Current dependencies
@@ -32,8 +32,10 @@ additional questions or comments.
   - Golang - 1.20.5
 ##### Code change log
 ## What's Changed
-## What's Changed
-* update mdsd to 1.28.11 by @pfrcks in https://github.com/microsoft/Docker-Provider/pull/1106
+- Linux
+    * Update mdsd to 1.28.11 by @pfrcks in https://github.com/microsoft/Docker-Provider/pull/1106
+- Azure Arc K8s Extension
+    * Change mcr path in mooncake cloud to public mcr by @wanlonghenry in https://github.com/microsoft/Docker-Provider/pull/1132
 
 ### 10/25/2023 - HOTFIX
 ##### ARC Version - 3.1.15.1

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.                         | Image repo path is mcr.microsoft.com/azuremonitor/containerinsights/ciprod
 | `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 }}