Skip to content

Add Watson daemon set to HCP cluster to meet KPI #6820

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

Open
Jonathan CHang (jonathan34c) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Watson daemon set to HCP cluster to meet KPI #6820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 42 additions & 0 deletions config/config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,48 @@
"image"
]
},
"watson": {
"type": "object",
"properties": {
"image": {
"$ref": "#/definitions/containerImage"
},
"securityContext": {
"type": "object",
"properties": {
"privileged": {
"type": "boolean"
}
},
"additionalProperties": false,
"required": [
"privileged"
]
},
"resources": {
"$ref": "#/definitions/containerResources"
},
"volumes": {
"type": "object",
"properties": {
"crashdumpHostPath": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"crashdumpHostPath"
]
}
},
"additionalProperties": false,
"required": [
"image",
"securityContext",
"resources",
"volumes"
]
},
"kusto": {
"type": "object",
"properties": {
Expand Down
16 changes: 16 additions & 0 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,22 @@ defaults:
memory: 256Mi
limits:
memory: 1248Mi
watson:
image:
registry: mcr.microsoft.com
repository: azure-watson/agent/azlinux3
digest: sha256:8e5ef3e76be33794cef7460712eb9ff0c73bce8b8e5ffc33c5c6bfe0762f5db0 # 1.24.128.0
Comment on lines +187 to +191
securityContext:
privileged: true
resources:
requests:
cpu: 50m
memory: 128Mi
limits:
cpu: 250m
memory: 512Mi
volumes:
crashdumpHostPath: /home/docker/azure-watson
kusto:
enabled: false
buffering: true
Expand Down
16 changes: 16 additions & 0 deletions config/rendered/dev/ci00/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ arobit:
digest: sha256:0af23e7645c07968b9bd20f5c4a2966b34ccdaf8a05812b5eb5a3a26c53f24b5
registry: mcr.microsoft.com
repository: geneva/distroless/mdsd
watson:
image:
digest: sha256:8e5ef3e76be33794cef7460712eb9ff0c73bce8b8e5ffc33c5c6bfe0762f5db0
registry: mcr.microsoft.com
repository: azure-watson/agent/azlinux3
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
securityContext:
privileged: true
volumes:
crashdumpHostPath: /home/docker/azure-watson
auditLogsEventHub:
authRuleName: SendRule
enabled: false
Expand Down
16 changes: 16 additions & 0 deletions config/rendered/dev/ci01/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ arobit:
digest: sha256:0af23e7645c07968b9bd20f5c4a2966b34ccdaf8a05812b5eb5a3a26c53f24b5
registry: mcr.microsoft.com
repository: geneva/distroless/mdsd
watson:
image:
digest: sha256:8e5ef3e76be33794cef7460712eb9ff0c73bce8b8e5ffc33c5c6bfe0762f5db0
registry: mcr.microsoft.com
repository: azure-watson/agent/azlinux3
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
securityContext:
privileged: true
volumes:
crashdumpHostPath: /home/docker/azure-watson
auditLogsEventHub:
authRuleName: SendRule
enabled: true
Expand Down
16 changes: 16 additions & 0 deletions config/rendered/dev/cspr/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ arobit:
digest: sha256:0af23e7645c07968b9bd20f5c4a2966b34ccdaf8a05812b5eb5a3a26c53f24b5
registry: mcr.microsoft.com
repository: geneva/distroless/mdsd
watson:
image:
digest: sha256:8e5ef3e76be33794cef7460712eb9ff0c73bce8b8e5ffc33c5c6bfe0762f5db0
registry: mcr.microsoft.com
repository: azure-watson/agent/azlinux3
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
securityContext:
privileged: true
volumes:
crashdumpHostPath: /home/docker/azure-watson
auditLogsEventHub:
authRuleName: SendRule
enabled: false
Expand Down
16 changes: 16 additions & 0 deletions config/rendered/dev/dev/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ arobit:
digest: sha256:0af23e7645c07968b9bd20f5c4a2966b34ccdaf8a05812b5eb5a3a26c53f24b5
registry: mcr.microsoft.com
repository: geneva/distroless/mdsd
watson:
image:
digest: sha256:8e5ef3e76be33794cef7460712eb9ff0c73bce8b8e5ffc33c5c6bfe0762f5db0
registry: mcr.microsoft.com
repository: azure-watson/agent/azlinux3
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
securityContext:
privileged: true
volumes:
crashdumpHostPath: /home/docker/azure-watson
auditLogsEventHub:
authRuleName: SendRule
enabled: false
Expand Down
16 changes: 16 additions & 0 deletions config/rendered/dev/perf/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ arobit:
digest: sha256:0af23e7645c07968b9bd20f5c4a2966b34ccdaf8a05812b5eb5a3a26c53f24b5
registry: mcr.microsoft.com
repository: geneva/distroless/mdsd
watson:
image:
digest: sha256:8e5ef3e76be33794cef7460712eb9ff0c73bce8b8e5ffc33c5c6bfe0762f5db0
registry: mcr.microsoft.com
repository: azure-watson/agent/azlinux3
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
securityContext:
privileged: true
volumes:
crashdumpHostPath: /home/docker/azure-watson
auditLogsEventHub:
authRuleName: SendRule
enabled: false
Expand Down
16 changes: 16 additions & 0 deletions config/rendered/dev/pers/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ arobit:
digest: sha256:0af23e7645c07968b9bd20f5c4a2966b34ccdaf8a05812b5eb5a3a26c53f24b5
registry: mcr.microsoft.com
repository: geneva/distroless/mdsd
watson:
image:
digest: sha256:8e5ef3e76be33794cef7460712eb9ff0c73bce8b8e5ffc33c5c6bfe0762f5db0
registry: mcr.microsoft.com
repository: azure-watson/agent/azlinux3
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
securityContext:
privileged: true
volumes:
crashdumpHostPath: /home/docker/azure-watson
auditLogsEventHub:
authRuleName: SendRule
enabled: false
Expand Down
34 changes: 34 additions & 0 deletions dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_mgmt_1_arobit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,34 @@ spec:
- name: flb-config
mountPath: /forwarder/etc
readOnly: true
- name: watson-agent
image: mcr.microsoft.com/azure-watson/agent/azlinux3@sha256:1234567890
imagePullPolicy: 'IfNotPresent'
env:
- name: INCOMING_QUEUE
value: "/azure-watson/cores"
- name: REPORT_QUEUE
value: "/azure-watson/queue"
- name: MDSD_ROLE_PREFIX
value: "/var/run/mdsd/asa/"
- name: WA_CORE_PATTERN
value: "/azure-watson/cores/%e.%p.%h.%t"
- name: AUTHENTICATION_ID
value: "MsiClientId#__msiClientId__"
securityContext:
privileged: true
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
volumeMounts:
- name: watson-crashdump
mountPath: /azure-watson
- name: mdsd-run-clusterlogs
mountPath: /var/run/mdsd
terminationGracePeriodSeconds: 45
tolerations:
- effect: NoSchedule
Expand Down Expand Up @@ -920,6 +948,12 @@ spec:
configMap:
name: arobit-forwarder
defaultMode: 0755
- name: mdsd-run-clusterlogs
emptyDir: {}
- name: watson-crashdump
hostPath:
type: DirectoryOrCreate
path: "/home/docker/azure-watson"
---
# Source: arobit/templates/forwarder-servicemonitor.yaml
apiVersion: monitoring.coreos.com/v1
Expand Down
36 changes: 36 additions & 0 deletions dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_arobit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,34 @@ spec:
- name: flb-config
mountPath: /forwarder/etc
readOnly: true
- name: watson-agent
image: mcr.microsoft.com/azure-watson/agent/azlinux3@sha256:1234567890
imagePullPolicy: 'IfNotPresent'
env:
- name: INCOMING_QUEUE
value: "/azure-watson/cores"
- name: REPORT_QUEUE
value: "/azure-watson/queue"
- name: MDSD_ROLE_PREFIX
value: "/var/run/mdsd/asa/"
- name: WA_CORE_PATTERN
value: "/azure-watson/cores/%e.%p.%h.%t"
- name: AUTHENTICATION_ID
value: "MsiClientId#__msiClientId__"
securityContext:
privileged: true
resources:
limits:
cpu: 250m
memory: 512Mi
requests:
cpu: 50m
memory: 128Mi
volumeMounts:
- name: watson-crashdump
mountPath: /azure-watson
- name: mdsd-run-clusterlogs
mountPath: /var/run/mdsd
terminationGracePeriodSeconds: 45
tolerations:
- effect: NoSchedule
Expand Down Expand Up @@ -754,6 +782,14 @@ spec:
configMap:
name: arobit-forwarder
defaultMode: 0755
- name: mdsd-run-clusterlogs
hostPath:
path: /var/run/mdsd
type: Directory
- name: watson-crashdump
hostPath:
type: DirectoryOrCreate
path: "/home/docker/azure-watson"
---
# Source: arobit/templates/forwarder-servicemonitor.yaml
apiVersion: monitoring.coreos.com/v1
Expand Down
45 changes: 43 additions & 2 deletions observability/arobit/deploy/templates/forwarder-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,34 @@ spec:
- name: flb-config
mountPath: /forwarder/etc
readOnly: true
{{- if and .Values.forwarder.mdsd.enabled (eq .Values.forwarder.clusterType "mgmt") }}
{{- if and .Values.forwarder.mdsd.enabled (eq .Values.forwarder.clusterType "mgmt") }}
- name: shoebox-mappings
mountPath: /shoebox-config
readOnly: true
{{- end }}
Comment on lines +105 to +109
- name: watson-agent
image: {{ .Values.watson.image.registry }}/{{ .Values.watson.image.repository }}@{{ .Values.watson.image.digest }}
imagePullPolicy: '{{ .Values.watson.image.pullPolicy }}'
env:
Comment on lines +110 to +113
- name: INCOMING_QUEUE
value: {{ .Values.watson.env.INCOMING_QUEUE | quote }}
- name: REPORT_QUEUE
value: {{ .Values.watson.env.REPORT_QUEUE | quote }}
- name: MDSD_ROLE_PREFIX
value: {{ .Values.watson.env.MDSD_ROLE_PREFIX | quote }}
- name: WA_CORE_PATTERN
value: {{ .Values.watson.env.WA_CORE_PATTERN | quote }}
- name: AUTHENTICATION_ID
value: {{ .Values.watson.env.AUTHENTICATION_ID | quote }}
securityContext:
privileged: {{ .Values.watson.securityContext.privileged }}
resources: {{- toYaml .Values.watson.resources | nindent 12 }}
volumeMounts:
- name: watson-crashdump
mountPath: /azure-watson
- name: mdsd-run-clusterlogs
mountPath: /var/run/mdsd
{{- if and .Values.forwarder.mdsd.enabled (eq .Values.forwarder.clusterType "mgmt") }}
- name: mdsd-clusterlogs
image: {{ .Values.forwarder.mdsd.image.registry }}/{{ .Values.forwarder.mdsd.image.repository }}@{{ .Values.forwarder.mdsd.image.digest }}
imagePullPolicy: '{{ .Values.forwarder.mdsd.image.pullPolicy }}'
Expand Down Expand Up @@ -327,9 +354,23 @@ spec:
configMap:
name: arobit-forwarder
defaultMode: 0755
{{- if and .Values.forwarder.mdsd.enabled (eq .Values.forwarder.clusterType "mgmt") }}
- name: mdsd-run-clusterlogs
{{- if eq .Values.forwarder.clusterType "svc" }}
hostPath:
path: /var/run/mdsd
type: Directory
{{- else }}
emptyDir: {}
{{- end }}
- name: watson-crashdump
hostPath:
type: DirectoryOrCreate
path: {{ .Values.watson.volumes.crashdumpHostPath | quote }}
Comment thread
Copilot marked this conversation as resolved.
{{- if and .Values.forwarder.mdsd.enabled (eq .Values.forwarder.clusterType "mgmt") }}
- name: shoebox-mappings
configMap:
name: namespace-resourceid-mapping
optional: true
- name: geneva-certs-clusterlogs
csi:
driver: secrets-store.csi.k8s.io
Expand Down
Loading