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

Ksm upgrade to 2.12.0 #887

Merged
merged 4 commits into from
May 24, 2024
Merged

Ksm upgrade to 2.12.0 #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7c641a
upgrade ksm
Sohamdg081992 May 14, 2024
39e520f
fix
Sohamdg081992 May 14, 2024
0f10105
remove branch
Sohamdg081992 May 15, 2024
fdaa299
update trivy for ksm upgrade
Sohamdg081992 May 17, 2024
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
2 changes: 1 addition & 1 deletion .pipelines/azure-pipeline-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ variables:
MCR_REPOSITORY: '/azuremonitor/containerinsights/cidev/prometheus-collector/images'
MCR_REPOSITORY_HELM: '/azuremonitor/containerinsights/cidev/prometheus-collector'
MCR_REPOSITORY_HELM_DEPENDENCIES: '/azuremonitor/containerinsights/cidev'
KUBE_STATE_METRICS_IMAGE: 'mcr.microsoft.com/oss/kubernetes/kube-state-metrics:v2.9.2'
KUBE_STATE_METRICS_IMAGE: 'mcr.microsoft.com/oss/kubernetes/kube-state-metrics:v2.12.0'
NODE_EXPORTER_IMAGE: 'mcr.microsoft.com/oss/prometheus/node-exporter:v1.6.0'
IS_PR: $[eq(variables['Build.Reason'], 'PullRequest')]
IS_MAIN_BRANCH: $[eq(variables['Build.SourceBranchName'], 'main')]
Expand Down
10 changes: 0 additions & 10 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,3 @@ CVE-2023-45284
CVE-2023-5678
# MEDIUM - ruby
CVE-2024-27281
# MEDIUM - KSM
CVE-2023-29406
CVE-2023-29409
CVE-2023-39318
CVE-2023-39319
CVE-2023-39326
CVE-2023-45284
# HIGH - KSM
CVE-2023-45283
CVE-2023-29403
2 changes: 1 addition & 1 deletion ...addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-ksm-clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: ama-metrics
app.kubernetes.io/name: ama-metrics-ksm
app.kubernetes.io/part-of: ama-metrics-ksm
app.kubernetes.io/version: 2.9.2
app.kubernetes.io/version: 2.12.0
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
name: ama-metrics-ksm
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions .../deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-ksm-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: ama-metrics
app.kubernetes.io/name: ama-metrics-ksm
app.kubernetes.io/part-of: ama-metrics-ksm
app.kubernetes.io/version: 2.9.2
app.kubernetes.io/version: 2.12.0
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
app.kubernetes.io/component: ama-metrics
app.kubernetes.io/name: ama-metrics-ksm
app.kubernetes.io/part-of: ama-metrics-ksm
app.kubernetes.io/version: 2.9.2
app.kubernetes.io/version: 2.12.0
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
Expand Down
2 changes: 1 addition & 1 deletion ...lector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-ksm-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: ama-metrics
app.kubernetes.io/name: ama-metrics-ksm
app.kubernetes.io/part-of: ama-metrics-ksm
app.kubernetes.io/version: 2.9.2
app.kubernetes.io/version: 2.12.0
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
name: ama-metrics-ksm
rules:
Expand Down
2 changes: 1 addition & 1 deletion ...tor/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-ksm-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: ama-metrics
app.kubernetes.io/name: ama-metrics-ksm
app.kubernetes.io/part-of: ama-metrics-ksm
app.kubernetes.io/version: 2.9.2
app.kubernetes.io/version: 2.12.0
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
annotations:
prometheus.io/scrape: 'true'
Expand Down
2 changes: 1 addition & 1 deletion ...loy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-ksm-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: ama-metrics
app.kubernetes.io/name: ama-metrics-ksm
app.kubernetes.io/part-of: ama-metrics-ksm
app.kubernetes.io/version: 2.9.2
app.kubernetes.io/version: 2.12.0
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
name: ama-metrics-ksm
namespace: kube-system
4 changes: 2 additions & 2 deletions otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ AzureMonitorMetrics:
#MetricLabelsAllowlist: "testlabel=[.*]"
#MetricAnnotationsAllowList: ""
ImageRepository: "/oss/kubernetes/kube-state-metrics"
# Kube-state-metrics ImageTag - 2.9.2, corresponds to chart version - 5.10.1
ImageTag: "v2.9.2"
# Kube-state-metrics ImageTag - 2.12.0, corresponds to chart version - 5.19.0
ImageTag: "v2.12.0"
Collectors:
- certificatesigningrequests
- configmaps
Expand Down
Loading