Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug for mcr path in mooncake cloud #1132

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Fix bug for mcr path in mooncake cloud #1132

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c22389
fix bug for mcr path in mooncake region
wanlonghenry Dec 7, 2023
e89387a
update readme
wanlonghenry Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/azuremonitor-containers/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
wanlonghenry marked this conversation as resolved.
Show resolved Hide resolved
| `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 |
Expand Down
4 changes: 0 additions & 4 deletions charts/azuremonitor-containers/templates/ama-logs-daemonset-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 0 additions & 8 deletions charts/azuremonitor-containers/templates/ama-logs-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 0 additions & 4 deletions charts/azuremonitor-containers/templates/ama-logs-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Loading