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

Jump to bottom

Revert token changes for arc due to Telegraf bug #1101

Merged
merged 3 commits into from
Oct 25, 2023
Merged

Revert token changes for arc due to Telegraf bug #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c92c0de
revert token changes for arc
wanlonghenry Oct 24, 2023
a167e6f
update ama-logs yaml
wanlonghenry Oct 24, 2023
de0c688
update triv ignore
wanlonghenry Oct 24, 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
1 change: 1 addition & 0 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#telegraf MEDIUM
GHSA-2w8w-qhg4-f78j
GHSA-fr2g-9hjm-wr23
CVE-2023-39325
CVE-2023-3978
CVE-2023-44487
Expand Down
20 changes: 0 additions & 20 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 @@ -102,9 +102,6 @@ spec:
- name: SIDECAR_SCRAPING_ENABLED
value: {{ .Values.amalogs.sidecarscraping | quote }}
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: C:\ProgramData\docker\containers
name: docker-windows-containers
readOnly: true
Expand Down Expand Up @@ -139,23 +136,6 @@ spec:
{{- end }}
{{- end }}
volumes:
- name: kube-api-access
projected:
sources:
- serviceAccountToken:
path: token
expirationSeconds: 3600
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace
- name: docker-windows-kuberenetes-container-logs
hostPath:
path: C:\var
Expand Down
23 changes: 0 additions & 23 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 @@ -137,9 +137,6 @@ spec:
- containerPort: 25224
protocol: UDP
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: /hostfs
name: host-root
readOnly: true
Expand Down Expand Up @@ -232,9 +229,6 @@ spec:
securityContext:
privileged: true
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: /etc/kubernetes/host
name: azure-json-path
- mountPath: /etc/ama-logs-secret
Expand Down Expand Up @@ -275,23 +269,6 @@ spec:
{{- end }}
{{- end }}
volumes:
- name: kube-api-access
projected:
sources:
- serviceAccountToken:
path: token
expirationSeconds: 3600
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace
- name: host-root
hostPath:
path: /
Expand Down
20 changes: 0 additions & 20 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 @@ -128,9 +128,6 @@ spec:
- containerPort: 25224
protocol: UDP
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: /var/run/host
name: docker-sock
- mountPath: /var/log
Expand Down Expand Up @@ -185,23 +182,6 @@ spec:
{{- end }}
{{- end }}
volumes:
- name: kube-api-access
projected:
sources:
- serviceAccountToken:
path: token
expirationSeconds: 3600
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace
- name: docker-sock
hostPath:
path: /var/run
Expand Down
63 changes: 0 additions & 63 deletions kubernetes/ama-logs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,6 @@ spec:
hostPort: 28330
protocol: TCP
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: /var/run/mdsd-PrometheusSidecar
name: mdsd-prometheus-sock
- mountPath: /hostfs
Expand Down Expand Up @@ -556,9 +553,6 @@ spec:
securityContext:
privileged: true
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: /var/run/mdsd-PrometheusSidecar
name: mdsd-prometheus-sock
- mountPath: /etc/kubernetes/host
Expand Down Expand Up @@ -609,23 +603,6 @@ spec:
- operator: "Exists"
effect: "PreferNoSchedule"
volumes:
- name: kube-api-access
projected:
sources:
- serviceAccountToken:
path: token
expirationSeconds: 3600
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace
- name: mdsd-prometheus-sock
emptyDir: {}
- name: host-root
Expand Down Expand Up @@ -833,9 +810,6 @@ spec:
- containerPort: 25224
protocol: UDP
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: /var/run/host
name: docker-sock
- mountPath: /var/log
Expand Down Expand Up @@ -905,23 +879,6 @@ spec:
- operator: "Exists"
effect: "PreferNoSchedule"
volumes:
- name: kube-api-access
projected:
sources:
- serviceAccountToken:
path: token
expirationSeconds: 3600
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace
- name: docker-sock
hostPath:
path: /var/run
Expand Down Expand Up @@ -1069,9 +1026,6 @@ spec:
# - name: USING_AAD_MSI_AUTH
# value: "true"
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
readOnly: true
- mountPath: C:\ProgramData\docker\containers
name: docker-windows-containers
readOnly: true
Expand Down Expand Up @@ -1131,23 +1085,6 @@ spec:
- operator: "Exists"
effect: PreferNoSchedule
volumes:
- name: kube-api-access
projected:
sources:
- serviceAccountToken:
path: token
expirationSeconds: 3600
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace
- name: docker-windows-kuberenetes-container-logs
hostPath:
path: C:\var
Expand Down
Loading