Updates to stable/msoms (#3658)

* latest oms values

* Add logpath, fix lint

* fix EOL lint
This commit is contained in:
David Tesar
2018-02-09 15:22:52 -08:00
committed by k8s-ci-robot
parent b35f934750
commit bbd67048a4
3 changed files with 43 additions and 37 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: msoms
version: 0.1.1
appVersion: 1.0.0-28
version: 0.1.2
appVersion: 1.0.0-30
description: A chart for deploying omsagent as a daemonset Kubernetes
keywords:
- monitoring
@@ -19,4 +19,4 @@ maintainers:
- name: Sambit Mishra
email: samis@microsoft.com
- name: Keiko Harada
email: keikhara@microsoft.com
email: keikhara@microsoft.com
@@ -18,7 +18,7 @@ spec:
app: {{ template "msoms.name" . }}
annotations:
agentVersion: {{ .Values.omsagent.image.tag }}
dockerProviderVersion: 10.0.0-28
dockerProviderVersion: {{ .Values.omsagent.image.dockerProviderVersion }}
spec:
containers:
- name: {{ template "msoms.name" . }}
@@ -38,6 +38,8 @@ spec:
name: docker-sock
- mountPath: /var/log
name: host-log
- mountPath: /var/lib/docker/containers
name: containerlog-path
- mountPath: /etc/omsagent-secret
name: omsagent-secret
readOnly: true
@@ -56,6 +58,9 @@ spec:
- name: host-log
hostPath:
path: /var/log
- name: containerlog-path
hostPath:
path: /var/lib/docker/containers
- name: omsagent-secret
secret:
secretName: {{ template "msoms.fullname" .}}
+34 -33
View File
@@ -1,33 +1,34 @@
## Default values for omsagent.
## Microsoft OMS Agent image
## ref: https://github.com/Microsoft/OMS-docker/blob/master/ReleaseNote.md
omsagent:
image:
tag: 1.4.1-45
pullPolicy: IfNotPresent
## To get your workspace id and key do the following
## - In the Azure Log Analytics portal, on the Overview page, click the Settings tile. Click the Connected Sources tab at the left and select "Linux Server" on the right hand side.
## - On the right of Workspace ID, click the copy icon and paste the ID into Notepad.
## - On the right of Primary Key, click the copy icon and paste the key into Notepad.
## For more information, please go [here.](https://docs.microsoft.com/en-us/azure/log-analytics/log-analytics-windows-agents#download-the-agent-setup-file-from-oms)
secret:
wsid: <your_workspace_id>
key: <your_workspace_key>
domain: opinsights.azure.com
## Configure resource requests and limits
## ref: http://kubernetes.io/docs/user-guide/compute-resources/
##
resources:
requests:
cpu: 100m
memory: 512Mi
limits:
cpu: 500m
memory: 768Mi
# Node selector - default to Linux as cannot deploy OMS agent container to Windows nodes
nodeSelector:
beta.kubernetes.io/os: linux
## Default values for omsagent.
## Microsoft OMS Agent image
## ref: https://github.com/Microsoft/OMS-docker/blob/master/ReleaseNote.md
omsagent:
image:
tag: 1.4.3-174
pullPolicy: IfNotPresent
dockerProviderVersion: 1.0.0-30
## To get your workspace id and key do the following
## - In the Azure Log Analytics portal, on the Overview page, click the Settings tile. Click the Connected Sources tab at the left and select "Linux Server" on the right hand side.
## - On the right of Workspace ID, click the copy icon and paste the ID into Notepad.
## - On the right of Primary Key, click the copy icon and paste the key into Notepad.
## For more information, please go [here.](https://docs.microsoft.com/en-us/azure/log-analytics/log-analytics-windows-agents#download-the-agent-setup-file-from-oms)
secret:
wsid: <your_workspace_id>
key: <your_workspace_key>
domain: opinsights.azure.com
## Configure resource requests and limits
## ref: http://kubernetes.io/docs/user-guide/compute-resources/
##
resources:
requests:
cpu: 100m
memory: 512Mi
limits:
cpu: 500m
memory: 768Mi
# Node selector - default to Linux as cannot deploy OMS agent container to Windows nodes
nodeSelector:
beta.kubernetes.io/os: linux