Skip to content

Commit

Permalink
Bump version to 2.0.0-rc.1 and work more on the release action
Browse files Browse the repository at this point in the history
Signed-off-by: Pete Wall <[email protected]>
  • Loading branch information
petewall committed Oct 31, 2024
1 parent f5187d0 commit 113b4b3
Show file tree
Hide file tree
Showing 34 changed files with 70 additions and 65 deletions.
85 changes: 45 additions & 40 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ name: Release Helm chart
# yamllint disable-line rule:truthy
on:
workflow_dispatch:
pull_request: {} # Temporary while testing

env:
BIN_PATH: bin
PACKAGE_PATH: package
INDEX_PATH: index

#env:
# CR_CONFIGFILE: "${{ github.workspace }}/source/.github/configs/cr.yaml"
# CR_INDEX_PATH: "${{ github.workspace }}/.cr-index"
# CR_TOOL_PATH: "${{ github.workspace }}/.cr-tool"
# CR_VERSION: "1.6.1"
jobs:
release:
runs-on: ubuntu-latest
Expand All @@ -32,6 +30,16 @@ jobs:
- name: Set up Helm
uses: azure/setup-helm@v4

- name: Install CR tool
run: |
mkdir "${BIN_PATH}"
mkdir "${PACKAGE_PATH}"
mkdir "${INDEX_PATH}"
crVersion=$(gh release list --repo helm/chart-releaser --exclude-pre-releases --json tagName --jq '.[0].tagName' | sed 's/v//')
curl -sSLo cr.tar.gz "https://github.com/helm/chart-releaser/releases/download/v${crVersion}/chart-releaser_${crVersion}_linux_amd64.tar.gz"
tar -xzf cr.tar.gz -C "${BIN_PATH}"
rm -f cr.tar.gz
- name: Configure Git
run: |
cd source
Expand All @@ -42,15 +50,6 @@ jobs:
git config user.name "$GITHUB_ACTOR"
git config user.email "[email protected]"
# - name: Install CR tool
# run: |
# mkdir "${CR_TOOL_PATH}"
# mkdir "${CR_PACKAGE_PATH}"
# mkdir "${CR_INDEX_PATH}"
# curl -sSLo cr.tar.gz "https://github.com/helm/chart-releaser/releases/download/v${CR_VERSION}/chart-releaser_${CR_VERSION}_linux_amd64.tar.gz"
# tar -xzf cr.tar.gz -C "${CR_TOOL_PATH}"
# rm -f cr.tar.gz

- name: Parse Chart.yaml
id: parse-chart
working-directory: source
Expand Down Expand Up @@ -78,10 +77,9 @@ jobs:
helm repo add kepler https://sustainable-computing-io.github.io/kepler-helm-chart
helm repo add opencost https://opencost.github.io/opencost-helm-chart
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
mkdir ../build
helm package charts/k8s-monitoring --destination ../build
helm package charts/k8s-monitoring --destination "../${PACKAGE_PATH}"
- name: Make release on K8s Monitoring Helm
- name: Create release on grafana/k8s-monitoring-helm
uses: softprops/action-gh-release@v2
with:
name: ${{ steps.parse-chart.outputs.tagVersion }}
Expand All @@ -90,29 +88,36 @@ jobs:
prerelease: ${{ steps.parse-version.outputs.prerelease != '' }}
token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
generate_release_notes: true
files: build/${{ steps.parse-chart.outputs.packagename }}.tgz
files: ${{ env.PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz
fail_on_unmatched_files: true

# # Note that this creates a release in grafana/helm-charts with a new tag.
# # Note that this creates a release in grafana/helm-charts GitHub Repository with a new tag.

Check failure on line 94 in .github/workflows/release.yml

View workflow job for this annotation

GitHub Actions / runner / yamllint

[yamllint] reported by reviewdog 🐶 [warning] comment not indented like content (comments-indentation) Raw Output: ./.github/workflows/release.yml:94:1: [warning] comment not indented like content (comments-indentation)
# # The tag name in grafana/helm-charts is <package>-<version>, while the
# # tag name for grafana/k8s-monitoring-helm is <version>.
# - name: Make release on Helm Charts
# uses: softprops/action-gh-release@v2
# with:
# name: ${{ steps.parse-chart.outputs.packagename }}
# repository: grafana/helm-charts
# tag_name: ${{ steps.parse-chart.outputs.packagename }}
# token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
# body: |
# ${{ steps.parse-chart.outputs.desc }}
#
# Source commit: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
#
# Tag on source: https://github.com/${{ github.repository }}/releases/tag/${{ steps.parse-chart.outputs.tagname }}
# files: |
# ${{ env.CR_PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz
#
# - name: Update helm-charts index.yaml
# run: |
# cd helm-charts
# "${CR_TOOL_PATH}/cr" index --config "${CR_CONFIGFILE}" --token "${{ secrets.GH_BOT_ACCESS_TOKEN }}" --index-path "${CR_INDEX_PATH}" --package-path "${CR_PACKAGE_PATH}" --push
- name: Create release on grafana/helm-charts
uses: softprops/action-gh-release@v2
with:
name: ${{ steps.parse-chart.outputs.packagename }}
repository: grafana/helm-charts
tag_name: ${{ steps.parse-chart.outputs.packagename }}
prerelease: ${{ steps.parse-version.outputs.prerelease != '' }}
token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
body: |
${{ steps.parse-chart.outputs.desc }}
Source commit: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
Tag on source: https://github.com/${{ github.repository }}/releases/tag/${{ steps.parse-chart.outputs.tagname }}
files: ${{ env.PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz
fail_on_unmatched_files: true


Check failure on line 114 in .github/workflows/release.yml

View workflow job for this annotation

GitHub Actions / runner / actionlint

[actionlint] reported by reviewdog 🐶 could not parse as YAML: yaml: line 114: did not find expected key [syntax-check] Raw Output: .github/workflows/release.yml:114:0: could not parse as YAML: yaml: line 114: did not find expected key [syntax-check]
- name: Update helm-charts index.yaml
working-directory: helm-charts
env:
CR_OWNER: grafana
CR_GIT_REPO: helm-charts
CR_PACKAGE_PATH: ${{ env.PACKAGE_PATH }}
CR_SKIP_EXISTING: true
CR_TOKEN: "${{ secrets.GH_BOT_ACCESS_TOKEN }}"
run: "${BIN_PATH}/cr" index --index-path "${INDEX_PATH}" --push

Check failure on line 123 in .github/workflows/release.yml

View workflow job for this annotation

GitHub Actions / runner / yamllint

[yamllint] reported by reviewdog 🐶 [error] syntax error: expected <block end>, but found '<scalar>' (syntax) Raw Output: ./.github/workflows/release.yml:123:31: [error] syntax error: expected <block end>, but found '<scalar>' (syntax)
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: application
icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg
sources:
- https://github.com/grafana/k8s-monitoring-helm/tree/main/charts/k8s-monitoring
version: 2.0.0-alpha.1
version: 2.0.0-rc.1
appVersion: 2.0.0
maintainers:
- email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# k8s-monitoring

![Version: 2.0.0-alpha.1](https://img.shields.io/badge/Version-2.0.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
![Version: 2.0.0-rc.1](https://img.shields.io/badge/Version-2.0.0--rc.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)

Capture all telemetry data from your Kubernetes cluster.

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1
Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="annotationAutodiscovery", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="annotationAutodiscovery", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="controlPlane,kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="integrations", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="integrations", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="integrations", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="prometheusOperatorObjects", version="1.0.0"} 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ data:
self-reporting-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
# TYPE grafana_kubernetes_monitoring_feature_info gauge
grafana_kubernetes_monitoring_feature_info{feature="annotationAutodiscovery", version="1.0.0"} 1
Expand Down
Loading

0 comments on commit 113b4b3

Please sign in to comment.