Skip to content

Gangams/jan agent release tasks #484

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

Merged
ganga1980 merged 6 commits into from
Jan 11, 2021
Merged

Gangams/jan agent release tasks #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95c60f6
wip
ganga1980 Jan 5, 2021
cbc1488
explicit amd64 affinity for hybrid workloads
ganga1980 Jan 5, 2021
d518a3e
fix space issue
ganga1980 Jan 6, 2021
ad712b8
Merge branch 'ci_dev' into gangams/jan-agent-release-tasks
ganga1980 Jan 6, 2021
c24d30b
wip
ganga1980 Jan 6, 2021
efa9f4a
revert vscode setting file
ganga1980 Jan 7, 2021
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
4 changes: 4 additions & 0 deletions charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ spec:
checksum/secret: {{ include (print $.Template.BasePath "/omsagent-secret.yaml") . | sha256sum }}
checksum/config: {{ toYaml .Values.omsagent.resources | sha256sum }}
spec:
dnsConfig:
options:
- name: ndots
value: "3"
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
nodeSelector:
kubernetes.io/os: windows
Expand Down
4 changes: 4 additions & 0 deletions charts/azuremonitor-containers/templates/omsagent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ spec:
checksum/config: {{ toYaml .Values.omsagent.resources | sha256sum }}
checksum/logsettings: {{ toYaml .Values.omsagent.logsettings | sha256sum }}
spec:
dnsConfig:
options:
- name: ndots
value: "3"
{{- if .Values.omsagent.rbac }}
serviceAccountName: omsagent
{{- end }}
Expand Down
18 changes: 17 additions & 1 deletion charts/azuremonitor-containers/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ omsagent:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- labelSelector:
matchExpressions:
matchExpressions:
- key: kubernetes.io/os
operator: In
values:
Expand All @@ -67,6 +67,10 @@ omsagent:
operator: NotIn
values:
- virtual-kubelet
- key: kubernetes.io/arch
operator: In
values:
- amd64
nodeSelectorTerms:
- labelSelector:
matchExpressions:
Expand All @@ -78,6 +82,10 @@ omsagent:
operator: NotIn
values:
- virtual-kubelet
- key: beta.kubernetes.io/arch
operator: In
values:
- amd64
deployment:
affinity:
nodeAffinity:
Expand Down Expand Up @@ -106,6 +114,10 @@ omsagent:
operator: NotIn
values:
- master
- key: kubernetes.io/arch
operator: In
values:
- amd64
nodeSelectorTerms:
- labelSelector:
matchExpressions:
Expand All @@ -121,6 +133,10 @@ omsagent:
operator: NotIn
values:
- master
- key: beta.kubernetes.io/arch
operator: In
values:
- amd64
## Configure resource requests and limits
## ref: http://kubernetes.io/docs/user-guide/compute-resources/
##
Expand Down
8 changes: 8 additions & 0 deletions kubernetes/omsagent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,10 @@ spec:
schema-versions: "v1"
spec:
serviceAccountName: omsagent
dnsConfig:
options:
- name: ndots
value: "3"
containers:
- name: omsagent
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11092020"
Expand Down Expand Up @@ -675,6 +679,10 @@ spec:
schema-versions: "v1"
spec:
serviceAccountName: omsagent
dnsConfig:
options:
- name: ndots
value: "3"
containers:
- name: omsagent-win
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod11092020"
Expand Down