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.

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

fix: Upgrades Kube state - image from: v2.8.1 to:v2.9.2; chart from:4.32.0 to 5.7.0 #516

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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.8.1'
KUBE_STATE_METRICS_IMAGE: 'mcr.microsoft.com/oss/kubernetes/kube-state-metrics:v2.9.2'
NODE_EXPORTER_IMAGE: 'mcr.microsoft.com/oss/prometheus/node-exporter:v1.5.0'
IS_PR: $[eq(variables['Build.Reason'], 'PullRequest')]
IS_MAIN_BRANCH: $[eq(variables['Build.SourceBranchName'], 'main')]
Expand Down
4 changes: 4 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Azure Monitor Metrics for AKS clusters

## Pending

* fix: Upgrades Kube state - image from: `v2.8.1` to:`v2.9.2`; chart from:`4.32.0` to `5.7.0`

## Release 06-02-2023
* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.7.1-main-06-02-2023-d384b035`
* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.7.1-main-06-02-2023-d384b035-win`
Expand Down
3 changes: 2 additions & 1 deletion internal/docs/UpgradeDependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ Example PR: https://github.com/Azure/prometheus-collector/pull/418

Updating KSM and NE charts
1. For updating the charts for KSM and NE, replace the respective folders from here respectively under dependentcharts, [KSM](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics) and [NE](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-node-exporter).
2. Update the Version and Appversion in all the yaml files for both 1p and addon charts from the example PR above.
2. Update the Version and Appversion in all the yaml files for both 1p and addon charts from the example PR above. (Note: The version and appversion values can be found [here](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-state-metrics/Chart.yaml))
3. Update both the images in our pipeline build file : azure-pipeline-build.yml
4. Run the Github Action [build-and-push-dependent-helm-chart](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-dependent-helm-charts.yml) for getting PR build to succeed.

For upgrading all other dependencies, update them in setup.sh (for linux) and setup.ps1(for win).

Expand Down
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.8.1
app.kubernetes.io/version: 2.9.2
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
name: ama-metrics-ksm
roleRef:
Expand Down
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.8.1
app.kubernetes.io/version: 2.9.2
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.8.1
app.kubernetes.io/version: 2.9.2
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
Expand Down
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.8.1
app.kubernetes.io/version: 2.9.2
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
name: ama-metrics-ksm
rules:
Expand Down
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.8.1
app.kubernetes.io/version: 2.9.2
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
annotations:
prometheus.io/scrape: 'true'
Expand Down
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.8.1
app.kubernetes.io/version: 2.9.2
helm.sh/chart: azure-monitor-metrics-addon-0.1.0
name: ama-metrics-ksm
namespace: kube-system
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.8.1, corresponds to chart version - 4.32.0
ImageTag: "v2.8.1"
# Kube-state-metrics ImageTag - 2.9.2, corresponds to chart version - 5.7.0
ImageTag: "v2.9.2"
Collectors:
- certificatesigningrequests
- configmaps
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ appVersion: "${IMAGE_TAG}"
kubeVersion: ">=1.16.0-0"
dependencies:
- name: kube-state-metrics
version: "4.32.0"
version: "5.7.0"
repository: oci://${MCR_REGISTRY}${MCR_REPOSITORY_HELM_DEPENDENCIES}
condition: scrapeTargets.kubeState
- name: prometheus-node-exporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ keywords:
- prometheus
- kubernetes
type: application
version: 4.32.0
appVersion: 2.8.1
version: 5.7.0
appVersion: 2.9.2
home: https://github.com/kubernetes/kube-state-metrics/
sources:
- https://github.com/kubernetes/kube-state-metrics/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
prometheusScrape: true
image:
repository: mcr.microsoft.com/oss/kubernetes/kube-state-metrics
tag: v2.8.1
tag: v2.9.2
sha: ""
pullPolicy: IfNotPresent

Expand Down