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

Updating omsagent yaml to have parity with omsagent yaml file in AKS RP #615

Merged
merged 3 commits into from
Aug 25, 2021
Merged

Updating omsagent yaml to have parity with omsagent yaml file in AKS RP #615

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb6974b
changes
rashmichandrashekar Jul 23, 2021
912bc83
fixing PR comments
rashmichandrashekar Jul 29, 2021
d562f9d
Merge branch 'ci_dev' into rashmi/aks-yaml-parity
rashmichandrashekar Aug 25, 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
142 changes: 81 additions & 61 deletions kubernetes/omsagent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,19 @@ spec:
memory: 225Mi
env:
# azure devops pipeline uses AKS_RESOURCE_ID and AKS_REGION hence ensure to uncomment these
- name: AKS_CLUSTER_NAME
vishiy marked this conversation as resolved.
Show resolved Hide resolved
value: "VALUE_AKS_CLUSTER_NAME"
- name: AKS_RESOURCE_ID
value: "VALUE_AKS_RESOURCE_ID_VALUE"
- name: AKS_REGION
value: "VALUE_AKS_RESOURCE_REGION_VALUE"
- name: FBIT_SERVICE_FLUSH_INTERVAL
vishiy marked this conversation as resolved.
Show resolved Hide resolved
value: "15"
- name: AKS_NODE_RESOURCE_GROUP
rashmichandrashekar marked this conversation as resolved.
Show resolved Hide resolved
value: "VALUE_AKS_NODE_RESOURCE_GROUP"
# this used for e2e test and setting this just emits some additional log statements which used for the e2e tests
- name: ISTEST
value: "true"
#- name: ISTEST
rashmichandrashekar marked this conversation as resolved.
Show resolved Hide resolved
# value: "true"
#Uncomment below two lines for ACS clusters and set the cluster names manually. Also comment out the above two lines for ACS clusters
#- name: ACS_RESOURCE_NAME
# value: "my_acs_cluster_name"
Expand All @@ -400,6 +406,8 @@ spec:
value: ""
- name: AZMON_CONTAINERLOGS_ONEAGENT_REGIONS
value: "koreacentral,norwayeast,eastus2"
- name: USING_AAD_MSI_AUTH
value: "false"
securityContext:
privileged: true
ports:
Expand Down Expand Up @@ -445,59 +453,65 @@ spec:
periodSeconds: 60
timeoutSeconds: 15
#Only in sidecar scraping mode
- name: omsagent-prometheus
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06112021"
imagePullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
memory: 1Gi
requests:
cpu: 75m
memory: 225Mi
env:
# azure devops pipeline uses AKS_RESOURCE_ID and AKS_REGION hence ensure to uncomment these
- name: AKS_RESOURCE_ID
value: "VALUE_AKS_RESOURCE_ID_VALUE"
- name: AKS_REGION
value: "VALUE_AKS_RESOURCE_REGION_VALUE"
#Uncomment below two lines for ACS clusters and set the cluster names manually. Also comment out the above two lines for ACS clusters
#- name: ACS_RESOURCE_NAME
# value: "my_acs_cluster_name"
- name: CONTAINER_TYPE
value: "PrometheusSidecar"
- name: CONTROLLER_TYPE
value: "DaemonSet"
- name: NODE_IP
valueFrom:
fieldRef:
fieldPath: status.hostIP
# Update this with the user assigned msi client id for omsagent
- name: USER_ASSIGNED_IDENTITY_CLIENT_ID
value: ""
securityContext:
privileged: true
volumeMounts:
- mountPath: /etc/kubernetes/host
name: azure-json-path
- mountPath: /etc/omsagent-secret
name: omsagent-secret
readOnly: true
- mountPath: /etc/config/settings
name: settings-vol-config
readOnly: true
- mountPath: /etc/config/osm-settings
name: osm-settings-vol-config
readOnly: true
livenessProbe:
exec:
command:
- /bin/bash
- -c
- /opt/livenessprobe.sh
initialDelaySeconds: 60
periodSeconds: 60
timeoutSeconds: 15
# - name: omsagent-prometheus
rashmichandrashekar marked this conversation as resolved.
Show resolved Hide resolved
# image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod06112021"
# imagePullPolicy: IfNotPresent
# resources:
# limits:
# cpu: 500m
# memory: 1Gi
# requests:
# cpu: 75m
# memory: 225Mi
# env:
# # azure devops pipeline uses AKS_RESOURCE_ID and AKS_REGION hence ensure to uncomment these
# - name: AKS_CLUSTER_NAME
# value: "VALUE_AKS_CLUSTER_NAME"
# - name: AKS_RESOURCE_ID
# value: "VALUE_AKS_RESOURCE_ID_VALUE"
# - name: AKS_REGION
# value: "VALUE_AKS_RESOURCE_REGION_VALUE"
# - name: AKS_NODE_RESOURCE_GROUP
# value: "VALUE_AKS_NODE_RESOURCE_GROUP"
# #Uncomment below two lines for ACS clusters and set the cluster names manually. Also comment out the above two lines for ACS clusters
# #- name: ACS_RESOURCE_NAME
# # value: "my_acs_cluster_name"
# - name: CONTAINER_TYPE
# value: "PrometheusSidecar"
# - name: CONTROLLER_TYPE
# value: "DaemonSet"
# - name: NODE_IP
# valueFrom:
# fieldRef:
# fieldPath: status.hostIP
# # Update this with the user assigned msi client id for omsagent
# - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
# value: ""
# - name: USING_AAD_MSI_AUTH
# value: "false"
# securityContext:
# privileged: true
# volumeMounts:
# - mountPath: /etc/kubernetes/host
# name: azure-json-path
# - mountPath: /etc/omsagent-secret
# name: omsagent-secret
# readOnly: true
# - mountPath: /etc/config/settings
# name: settings-vol-config
# readOnly: true
# - mountPath: /etc/config/osm-settings
# name: osm-settings-vol-config
# readOnly: true
# livenessProbe:
# exec:
# command:
# - /bin/bash
# - -c
# - /opt/livenessprobe.sh
# initialDelaySeconds: 60
# periodSeconds: 60
# timeoutSeconds: 15
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand Down Expand Up @@ -599,13 +613,17 @@ spec:
cpu: 150m
memory: 250Mi
env:
- name: AKS_CLUSTER_NAME
value: "VALUE_AKS_CLUSTER_NAME"
- name: AKS_RESOURCE_ID
value: "VALUE_AKS_RESOURCE_ID_VALUE"
- name: AKS_REGION
value: "VALUE_AKS_RESOURCE_REGION_VALUE"
- name: AKS_NODE_RESOURCE_GROUP
value: "VALUE_AKS_NODE_RESOURCE_GROUP"
# this used for e2e test and setting this just emits some additional log statements which used for the e2e tests
- name: ISTEST
value: "true"
# - name: ISTEST
# value: "true"
# Uncomment below two lines for ACS clusters and set the cluster names manually. Also comment out the above two lines for ACS clusters
#- name: ACS_RESOURCE_NAME
# value: "my_acs_cluster_name"
Expand All @@ -620,7 +638,9 @@ spec:
value: ""
# Add the below environment variable to true only in sidecar enabled regions, else set it to false
- name: SIDECAR_SCRAPING_ENABLED
value: "true"
value: "false"
- name: USING_AAD_MSI_AUTH
value: "false"
securityContext:
privileged: true
ports:
Expand Down Expand Up @@ -789,13 +809,13 @@ spec:
fieldRef:
fieldPath: status.hostIP
- name: SIDECAR_SCRAPING_ENABLED
value: "true"
value: "false"
# Update this with the user assigned msi client id for omsagent
- name: USER_ASSIGNED_IDENTITY_CLIENT_ID
value: ""
# Add this only for clouds that require cert bootstrapping
- name: REQUIRES_CERT_BOOTSTRAP
value: "true"
# - name: REQUIRES_CERT_BOOTSTRAP
rashmichandrashekar marked this conversation as resolved.
Show resolved Hide resolved
# value: "true"
volumeMounts:
- mountPath: C:\ProgramData\docker\containers
name: docker-windows-containers
Expand Down