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

chore: add version labels for all internal charts #350

Merged
merged 7 commits into from
Dec 2, 2024
Merged

Conversation

saansh45
Copy link
Contributor

@saansh45 saansh45 commented Dec 2, 2024

Description:

This PR introduces a new custom label function to all internal Helm charts. The purpose of this function is to enhance the visibility of Helm chart versioning for the applications using these charts.

The new labels added by the function are:

  • helm.chart/name: Specifies the chart name (e.g., simple-app).
  • helm.chart/version: Reflects the chart version (.Chart.Version).

Why is this change needed?

  1. Improved Visibility:

    • These labels will allow us to track the Helm chart version deployed for each application easily.
    • It provides better observability into versioning at a glance.
  2. Grafana Dashboard Integration:

    • We will use this labeling information to create a Grafana dashboard that displays applications along with their corresponding Helm chart versions.

Example Usage:

Here’s how the labels will look after applying this change:

labels:
  helm.sh/chartName: "simple-app"
  helm.sh/chartVersion: "1.12.4"
  app.kubernetes.io/name: "simple-app"
  app.kubernetes.io/instance: "simple-app-instance"

Testing:

  • Verified that the generated manifests include the expected labels.
  • Ensured no breaking changes to existing functionality.

Simple-app diff

$ diff -u -b orig new
--- orig	2024-12-02 16:13:24
+++ new	2024-12-02 17:00:38
@@ -4,8 +4,8 @@
 ...Successfully got an update from the "flink-operator" chart repository
 ...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "strimzi" chart repository
-...Successfully got an update from the "jetstack" chart repository
 ...Successfully got an update from the "k8s-charts" chart repository
+...Successfully got an update from the "jetstack" chart repository
 ...Successfully got an update from the "argo" chart repository
 ...Successfully got an update from the "fairwinds-stable" chart repository
 Update Complete. ⎈Happy Helming!⎈
@@ -20,13 +20,15 @@
 metadata:
   name: simple-app-ingress-access
   labels:
-    helm.sh/chart: simple-app-1.12.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: simple-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "simple-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: simple-app
-    app.kubernetes.io/instance: simple-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chartName: simple-app
+    helm.sh/chartVersion: 1.12.4
+    tags.datadoghq.com/service: simple-app
+    tags.datadoghq.com/version: latest
 spec:
   policyTypes: [Ingress]
   podSelector:
@@ -46,7 +48,7 @@
 metadata:
   name: simple-app-ingress
   labels:
-    helm.sh/chart: simple-app-1.12.3
+    helm.sh/chart: simple-app-1.12.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -79,13 +81,15 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: simple-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "simple-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: simple-app
-    app.kubernetes.io/instance: simple-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chartName: simple-app
+    helm.sh/chartVersion: 1.12.4
+    tags.datadoghq.com/service: simple-app
+    tags.datadoghq.com/version: latest
 spec:
   selector:
     matchLabels:
@@ -100,13 +104,15 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: simple-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "simple-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: simple-app
-    app.kubernetes.io/instance: simple-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chartName: simple-app
+    helm.sh/chartVersion: 1.12.4
+    tags.datadoghq.com/service: simple-app
+    tags.datadoghq.com/version: latest
 ---
 # Source: simple-app/templates/secret.yaml
 apiVersion: v1
@@ -122,7 +128,7 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.3
+    helm.sh/chart: simple-app-1.12.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -155,7 +161,7 @@
 metadata:
   name: simple-app-metrics
   labels:
-    helm.sh/chart: simple-app-1.12.3
+    helm.sh/chart: simple-app-1.12.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -180,13 +186,15 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: simple-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "simple-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: simple-app
-    app.kubernetes.io/instance: simple-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chartName: simple-app
+    helm.sh/chartVersion: 1.12.4
+    tags.datadoghq.com/service: simple-app
+    tags.datadoghq.com/version: latest
 spec:
   revisionHistoryLimit: 3
   selector:
@@ -238,13 +246,15 @@
             }
           ]
       labels:
-        helm.sh/chart: simple-app-1.12.3
-        app.kubernetes.io/version: "latest"
+        app.kubernetes.io/instance: simple-app
         app.kubernetes.io/managed-by: Helm
-        tags.datadoghq.com/service: "simple-app"
-        tags.datadoghq.com/version: "latest"
         app.kubernetes.io/name: simple-app
-        app.kubernetes.io/instance: simple-app
+        app.kubernetes.io/version: latest
+        helm.sh/chart: simple-app-1.12.4
+        helm.sh/chartName: simple-app
+        helm.sh/chartVersion: 1.12.4
+        tags.datadoghq.com/service: simple-app
+        tags.datadoghq.com/version: latest
         sidecar.istio.io/inject: "true"
         istio.io/rev: "stable"
         prometheus.istio.io/merge-metrics: "false"
@@ -334,13 +344,15 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: simple-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "simple-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: simple-app
-    app.kubernetes.io/instance: simple-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chartName: simple-app
+    helm.sh/chartVersion: 1.12.4
+    tags.datadoghq.com/service: simple-app
+    tags.datadoghq.com/version: latest
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
@@ -383,13 +395,15 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: simple-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "simple-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: simple-app
-    app.kubernetes.io/instance: simple-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chartName: simple-app
+    helm.sh/chartVersion: 1.12.4
+    tags.datadoghq.com/service: simple-app
+    tags.datadoghq.com/version: latest
   annotations:
     alb.ingress.kubernetes.io/tags: kubernetes_namespace=simple-app
 spec:
@@ -493,13 +507,15 @@
 metadata:
   name: simple-app-simple-app-rules
   labels:
-    helm.sh/chart: simple-app-1.12.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: simple-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "simple-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: simple-app
-    app.kubernetes.io/instance: simple-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chartName: simple-app
+    helm.sh/chartVersion: 1.12.4
+    tags.datadoghq.com/service: simple-app
+    tags.datadoghq.com/version: latest
 spec:
   groups:
   - name: simple-app.simple-app.simple-app.PodRules
@@ -693,7 +709,7 @@
 metadata:
   name: simple-app-monitor-rules
   labels:
-    helm.sh/chart: simple-app-1.12.3
+    helm.sh/chart: simple-app-1.12.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -717,7 +733,7 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.3
+    helm.sh/chart: simple-app-1.12.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -761,7 +777,7 @@
 metadata:
   name: "simple-app-test-connection"
   labels:
-    helm.sh/chart: simple-app-1.12.3
+    helm.sh/chart: simple-app-1.12.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"

Stateful-app diff

$ diff -u -b orig new
--- orig	2024-12-02 16:13:34
+++ new	2024-12-02 17:00:47
@@ -20,13 +20,15 @@
 metadata:
   name: stateful-app-ingress-access
   labels:
-    helm.sh/chart: stateful-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: stateful-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "stateful-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: stateful-app
-    app.kubernetes.io/instance: stateful-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chartName: stateful-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: stateful-app
+    tags.datadoghq.com/version: latest
 spec:
   policyTypes: [Ingress]
   podSelector:
@@ -46,13 +48,15 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: stateful-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "stateful-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: stateful-app
-    app.kubernetes.io/instance: stateful-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chartName: stateful-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: stateful-app
+    tags.datadoghq.com/version: latest
 spec:
   selector:
     matchLabels:
@@ -67,13 +71,15 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: stateful-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "stateful-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: stateful-app
-    app.kubernetes.io/instance: stateful-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chartName: stateful-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: stateful-app
+    tags.datadoghq.com/version: latest
 ---
 # Source: stateful-app/templates/service.yaml
 apiVersion: v1
@@ -81,7 +87,7 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.3
+    helm.sh/chart: stateful-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -114,7 +120,7 @@
 metadata:
   name: stateful-app-metrics
   labels:
-    helm.sh/chart: stateful-app-1.4.3
+    helm.sh/chart: stateful-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -139,13 +145,15 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: stateful-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "stateful-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: stateful-app
-    app.kubernetes.io/instance: stateful-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chartName: stateful-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: stateful-app
+    tags.datadoghq.com/version: latest
 spec:
   replicas: 2
   revisionHistoryLimit: 3
@@ -198,13 +206,15 @@
             }
           ]
       labels:
-        helm.sh/chart: stateful-app-1.4.3
-        app.kubernetes.io/version: "latest"
+        app.kubernetes.io/instance: stateful-app
         app.kubernetes.io/managed-by: Helm
-        tags.datadoghq.com/service: "stateful-app"
-        tags.datadoghq.com/version: "latest"
         app.kubernetes.io/name: stateful-app
-        app.kubernetes.io/instance: stateful-app
+        app.kubernetes.io/version: latest
+        helm.sh/chart: stateful-app-1.4.4
+        helm.sh/chartName: stateful-app
+        helm.sh/chartVersion: 1.4.4
+        tags.datadoghq.com/service: stateful-app
+        tags.datadoghq.com/version: latest
         sidecar.istio.io/inject: "true"
         istio.io/rev: "stable"
         prometheus.istio.io/merge-metrics: "false"
@@ -287,13 +297,15 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: stateful-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "stateful-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: stateful-app
-    app.kubernetes.io/instance: stateful-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chartName: stateful-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: stateful-app
+    tags.datadoghq.com/version: latest
   annotations:
     alb.ingress.kubernetes.io/tags: kubernetes_namespace=stateful-app
 spec:
@@ -397,13 +409,15 @@
 metadata:
   name: stateful-app-stateful-app-rules
   labels:
-    helm.sh/chart: stateful-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: stateful-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "stateful-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: stateful-app
-    app.kubernetes.io/instance: stateful-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chartName: stateful-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: stateful-app
+    tags.datadoghq.com/version: latest
 spec:
   groups:
   - name: stateful-app.stateful-app.stateful-app.PodRules
@@ -600,7 +614,7 @@
 metadata:
   name: stateful-app-monitor-rules
   labels:
-    helm.sh/chart: stateful-app-1.4.3
+    helm.sh/chart: stateful-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -624,7 +638,7 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.3
+    helm.sh/chart: stateful-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -668,7 +682,7 @@
 metadata:
   name: "stateful-app-test-connection"
   labels:
-    helm.sh/chart: stateful-app-1.4.3
+    helm.sh/chart: stateful-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"

rollout-app diff

$ diff -u -b orig new
--- orig	2024-12-02 16:13:46
+++ new	2024-12-02 17:00:32
@@ -1,8 +1,8 @@
 Pulling dependencies in...
 helm dependency update .
 Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "flink-operator" chart repository
+...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "strimzi" chart repository
 ...Successfully got an update from the "k8s-charts" chart repository
 ...Successfully got an update from the "jetstack" chart repository
@@ -20,13 +20,15 @@
 metadata:
   name: rollout-app-ingress-access
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
 spec:
   policyTypes: [Ingress]
   podSelector:
@@ -46,7 +48,7 @@
 metadata:
   name: rollout-app-ingress
   labels:
-    helm.sh/chart: rollout-app-1.4.3
+    helm.sh/chart: rollout-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"
@@ -79,13 +81,15 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
 spec:
   selector:
     matchLabels:
@@ -100,13 +104,15 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
 ---
 # Source: rollout-app/templates/secret.yaml
 apiVersion: v1
@@ -122,13 +128,15 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
   annotations:

     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: kubernetes_namespace=rollout-app
@@ -154,13 +162,15 @@
 metadata:
   name: rollout-app-preview
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
   annotations:

     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: kubernetes_namespace=rollout-app
@@ -186,13 +196,15 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
 spec:
   scaleTargetRef:
     apiVersion: argoproj.io/v1alpha1
@@ -235,13 +247,15 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
   annotations:
     alb.ingress.kubernetes.io/tags: kubernetes_namespace=rollout-app
 spec:
@@ -263,7 +277,7 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.3
+    helm.sh/chart: rollout-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"
@@ -384,7 +398,7 @@
 metadata:
   name: rollout-app-monitor-rules
   labels:
-    helm.sh/chart: rollout-app-1.4.3
+    helm.sh/chart: rollout-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"
@@ -408,13 +422,15 @@
 metadata:
   name: rollout-app-rollout-app-rules
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
 spec:
   groups:
   - name: rollout-app.rollout-app.rollout-app.PodRules
@@ -590,13 +606,15 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.3
-    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/instance: rollout-app
     app.kubernetes.io/managed-by: Helm
-    tags.datadoghq.com/service: "rollout-app"
-    tags.datadoghq.com/version: "latest"
     app.kubernetes.io/name: rollout-app
-    app.kubernetes.io/instance: rollout-app
+    app.kubernetes.io/version: latest
+    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chartName: rollout-app
+    helm.sh/chartVersion: 1.4.4
+    tags.datadoghq.com/service: rollout-app
+    tags.datadoghq.com/version: latest
 spec:
   revisionHistoryLimit: 3
   selector:
@@ -653,13 +671,15 @@
             }
           ]
       labels:
-        helm.sh/chart: rollout-app-1.4.3
-        app.kubernetes.io/version: "latest"
+        app.kubernetes.io/instance: rollout-app
         app.kubernetes.io/managed-by: Helm
-        tags.datadoghq.com/service: "rollout-app"
-        tags.datadoghq.com/version: "latest"
         app.kubernetes.io/name: rollout-app
-        app.kubernetes.io/instance: rollout-app
+        app.kubernetes.io/version: latest
+        helm.sh/chart: rollout-app-1.4.4
+        helm.sh/chartName: rollout-app
+        helm.sh/chartVersion: 1.4.4
+        tags.datadoghq.com/service: rollout-app
+        tags.datadoghq.com/version: latest
         sidecar.istio.io/inject: "true"
         istio.io/rev: "stable"
         prometheus.istio.io/merge-metrics: "false"
@@ -740,7 +760,7 @@
 metadata:
   name: "rollout-app-test-connection"
   labels:
-    helm.sh/chart: rollout-app-1.4.3
+    helm.sh/chart: rollout-app-1.4.4
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"

@saansh45 saansh45 marked this pull request as ready for review December 2, 2024 21:53
@saansh45 saansh45 requested a review from a team as a code owner December 2, 2024 21:53
@saansh45 saansh45 requested a review from diranged December 2, 2024 21:54
@saansh45 saansh45 requested a review from diranged December 2, 2024 22:06
{{- define "daemonset-app.labels" -}}
{{- $baseLabels := include "nd-common.labels" . | fromYaml -}}
{{- $extendedLabels := merge $baseLabels (dict
"helm.sh/chartName" "daemonset-app"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

@saansh45 saansh45 merged commit a7d3911 into main Dec 2, 2024
2 checks passed
@saansh45 saansh45 deleted the add_version_labels branch December 2, 2024 22:39
Comment on lines +12 to +13
"helm.sh/chartName" "daemonset-app"
"helm.sh/chartVersion" .Chart.Version
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding standup discussion comments for the record...

I suggested we do not use the helm.sh namespace and instead use a namespace like helm.nextdoor.com or oss.nextdoor.com. This is because we are adding a new label that helm.sh themselves have not yet defined and therefore no API for it exists. In order to avoid any future naming collisions, I believe we should be name-spacing this new label use-case under our own namespace.

This might be an over-optimization, so we decided to differ to status quo due to no strong opinions.

cc: @diranged

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follow up PR #351

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that what we have is fine... helm.sh/chart is not some automatically created annotation or label, it's a recommendation at https://helm.sh/docs/chart_best_practices/labels/#standard-labels. We're merely extending that a bit.

saansh45 added a commit that referenced this pull request Dec 3, 2024
This is follow up PR to #350.
This just updates the label names to match kubernetes standards.

```diff
$ diff -u -b orig new
--- orig	2024-12-03 17:20:49
+++ new	2024-12-03 17:17:01
@@ -3,12 +3,12 @@
 Hang tight while we grab the latest from your chart repositories...
 ...Successfully got an update from the "flink-operator" chart repository
 ...Successfully got an update from the "codimd" chart repository
-...Successfully got an update from the "kedacore" chart repository
 ...Successfully got an update from the "strimzi" chart repository
+...Successfully got an update from the "kedacore" chart repository
 ...Successfully got an update from the "k8s-charts" chart repository
 ...Successfully got an update from the "jetstack" chart repository
-...Successfully got an update from the "fairwinds-stable" chart repository
 ...Successfully got an update from the "argo" chart repository
+...Successfully got an update from the "fairwinds-stable" chart repository
 Update Complete. ⎈Happy Helming!⎈
 Saving 2 charts
 Downloading istio-alerts from repo https://k8s-charts.nextdoor.com
@@ -25,9 +25,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: simple-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: simple-app-1.12.4
-    helm.sh/chartName: simple-app
-    helm.sh/chartVersion: 1.12.4
+    helm.sh/chart: simple-app-1.12.5
+    helm.sh/chart-name: simple-app
+    helm.sh/chart-version: 1.12.5
     tags.datadoghq.com/service: simple-app
     tags.datadoghq.com/version: latest
 spec:
@@ -49,7 +49,7 @@
 metadata:
   name: simple-app-ingress
   labels:
-    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chart: simple-app-1.12.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -86,9 +86,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: simple-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: simple-app-1.12.4
-    helm.sh/chartName: simple-app
-    helm.sh/chartVersion: 1.12.4
+    helm.sh/chart: simple-app-1.12.5
+    helm.sh/chart-name: simple-app
+    helm.sh/chart-version: 1.12.5
     tags.datadoghq.com/service: simple-app
     tags.datadoghq.com/version: latest
 spec:
@@ -109,9 +109,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: simple-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: simple-app-1.12.4
-    helm.sh/chartName: simple-app
-    helm.sh/chartVersion: 1.12.4
+    helm.sh/chart: simple-app-1.12.5
+    helm.sh/chart-name: simple-app
+    helm.sh/chart-version: 1.12.5
     tags.datadoghq.com/service: simple-app
     tags.datadoghq.com/version: latest
 ---
@@ -129,7 +129,7 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chart: simple-app-1.12.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -162,7 +162,7 @@
 metadata:
   name: simple-app-metrics
   labels:
-    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chart: simple-app-1.12.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -191,9 +191,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: simple-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: simple-app-1.12.4
-    helm.sh/chartName: simple-app
-    helm.sh/chartVersion: 1.12.4
+    helm.sh/chart: simple-app-1.12.5
+    helm.sh/chart-name: simple-app
+    helm.sh/chart-version: 1.12.5
     tags.datadoghq.com/service: simple-app
     tags.datadoghq.com/version: latest
 spec:
@@ -251,9 +251,9 @@
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: simple-app
         app.kubernetes.io/version: latest
-        helm.sh/chart: simple-app-1.12.4
-        helm.sh/chartName: simple-app
-        helm.sh/chartVersion: 1.12.4
+        helm.sh/chart: simple-app-1.12.5
+        helm.sh/chart-name: simple-app
+        helm.sh/chart-version: 1.12.5
         tags.datadoghq.com/service: simple-app
         tags.datadoghq.com/version: latest
         sidecar.istio.io/inject: "true"
@@ -349,9 +349,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: simple-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: simple-app-1.12.4
-    helm.sh/chartName: simple-app
-    helm.sh/chartVersion: 1.12.4
+    helm.sh/chart: simple-app-1.12.5
+    helm.sh/chart-name: simple-app
+    helm.sh/chart-version: 1.12.5
     tags.datadoghq.com/service: simple-app
     tags.datadoghq.com/version: latest
 spec:
@@ -400,9 +400,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: simple-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: simple-app-1.12.4
-    helm.sh/chartName: simple-app
-    helm.sh/chartVersion: 1.12.4
+    helm.sh/chart: simple-app-1.12.5
+    helm.sh/chart-name: simple-app
+    helm.sh/chart-version: 1.12.5
     tags.datadoghq.com/service: simple-app
     tags.datadoghq.com/version: latest
   annotations:
@@ -512,9 +512,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: simple-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: simple-app-1.12.4
-    helm.sh/chartName: simple-app
-    helm.sh/chartVersion: 1.12.4
+    helm.sh/chart: simple-app-1.12.5
+    helm.sh/chart-name: simple-app
+    helm.sh/chart-version: 1.12.5
     tags.datadoghq.com/service: simple-app
     tags.datadoghq.com/version: latest
 spec:
@@ -710,7 +710,7 @@
 metadata:
   name: simple-app-monitor-rules
   labels:
-    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chart: simple-app-1.12.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -734,7 +734,7 @@
 metadata:
   name: simple-app
   labels:
-    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chart: simple-app-1.12.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
@@ -778,7 +778,7 @@
 metadata:
   name: "simple-app-test-connection"
   labels:
-    helm.sh/chart: simple-app-1.12.4
+    helm.sh/chart: simple-app-1.12.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "simple-app"
```

```diff
$ diff -u -b orig new
--- orig	2024-12-03 17:21:09
+++ new	2024-12-03 17:17:19
@@ -1,12 +1,12 @@
 Pulling dependencies in...
 helm dependency update .
 Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "flink-operator" chart repository
+...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "kedacore" chart repository
 ...Successfully got an update from the "strimzi" chart repository
-...Successfully got an update from the "jetstack" chart repository
 ...Successfully got an update from the "k8s-charts" chart repository
+...Successfully got an update from the "jetstack" chart repository
 ...Successfully got an update from the "argo" chart repository
 ...Successfully got an update from the "fairwinds-stable" chart repository
 Update Complete. ⎈Happy Helming!⎈
@@ -25,9 +25,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: stateful-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: stateful-app-1.4.4
-    helm.sh/chartName: stateful-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: stateful-app-1.4.5
+    helm.sh/chart-name: stateful-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: stateful-app
     tags.datadoghq.com/version: latest
 spec:
@@ -53,9 +53,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: stateful-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: stateful-app-1.4.4
-    helm.sh/chartName: stateful-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: stateful-app-1.4.5
+    helm.sh/chart-name: stateful-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: stateful-app
     tags.datadoghq.com/version: latest
 spec:
@@ -76,9 +76,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: stateful-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: stateful-app-1.4.4
-    helm.sh/chartName: stateful-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: stateful-app-1.4.5
+    helm.sh/chart-name: stateful-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: stateful-app
     tags.datadoghq.com/version: latest
 ---
@@ -88,7 +88,7 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chart: stateful-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -121,7 +121,7 @@
 metadata:
   name: stateful-app-metrics
   labels:
-    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chart: stateful-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -150,9 +150,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: stateful-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: stateful-app-1.4.4
-    helm.sh/chartName: stateful-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: stateful-app-1.4.5
+    helm.sh/chart-name: stateful-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: stateful-app
     tags.datadoghq.com/version: latest
 spec:
@@ -211,9 +211,9 @@
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: stateful-app
         app.kubernetes.io/version: latest
-        helm.sh/chart: stateful-app-1.4.4
-        helm.sh/chartName: stateful-app
-        helm.sh/chartVersion: 1.4.4
+        helm.sh/chart: stateful-app-1.4.5
+        helm.sh/chart-name: stateful-app
+        helm.sh/chart-version: 1.4.5
         tags.datadoghq.com/service: stateful-app
         tags.datadoghq.com/version: latest
         sidecar.istio.io/inject: "true"
@@ -302,9 +302,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: stateful-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: stateful-app-1.4.4
-    helm.sh/chartName: stateful-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: stateful-app-1.4.5
+    helm.sh/chart-name: stateful-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: stateful-app
     tags.datadoghq.com/version: latest
   annotations:
@@ -414,9 +414,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: stateful-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: stateful-app-1.4.4
-    helm.sh/chartName: stateful-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: stateful-app-1.4.5
+    helm.sh/chart-name: stateful-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: stateful-app
     tags.datadoghq.com/version: latest
 spec:
@@ -615,7 +615,7 @@
 metadata:
   name: stateful-app-monitor-rules
   labels:
-    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chart: stateful-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -639,7 +639,7 @@
 metadata:
   name: stateful-app
   labels:
-    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chart: stateful-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
@@ -683,7 +683,7 @@
 metadata:
   name: "stateful-app-test-connection"
   labels:
-    helm.sh/chart: stateful-app-1.4.4
+    helm.sh/chart: stateful-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "stateful-app"
```

```diff
$ diff -u -b orig new
--- orig	2024-12-03 17:21:02
+++ new	2024-12-03 17:17:25
@@ -1,8 +1,8 @@
 Pulling dependencies in...
 helm dependency update .
 Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "flink-operator" chart repository
+...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "kedacore" chart repository
 ...Successfully got an update from the "strimzi" chart repository
 ...Successfully got an update from the "k8s-charts" chart repository
@@ -25,9 +25,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
 spec:
@@ -49,7 +49,7 @@
 metadata:
   name: rollout-app-ingress
   labels:
-    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chart: rollout-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"
@@ -86,9 +86,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
 spec:
@@ -109,9 +109,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
 ---
@@ -133,9 +133,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
   annotations:
@@ -167,9 +167,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
   annotations:
@@ -201,9 +201,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
 spec:
@@ -252,9 +252,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
   annotations:
@@ -278,7 +278,7 @@
 metadata:
   name: rollout-app
   labels:
-    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chart: rollout-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"
@@ -399,7 +399,7 @@
 metadata:
   name: rollout-app-monitor-rules
   labels:
-    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chart: rollout-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"
@@ -427,9 +427,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
 spec:
@@ -611,9 +611,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: rollout-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: rollout-app-1.4.4
-    helm.sh/chartName: rollout-app
-    helm.sh/chartVersion: 1.4.4
+    helm.sh/chart: rollout-app-1.4.5
+    helm.sh/chart-name: rollout-app
+    helm.sh/chart-version: 1.4.5
     tags.datadoghq.com/service: rollout-app
     tags.datadoghq.com/version: latest
 spec:
@@ -676,9 +676,9 @@
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: rollout-app
         app.kubernetes.io/version: latest
-        helm.sh/chart: rollout-app-1.4.4
-        helm.sh/chartName: rollout-app
-        helm.sh/chartVersion: 1.4.4
+        helm.sh/chart: rollout-app-1.4.5
+        helm.sh/chart-name: rollout-app
+        helm.sh/chart-version: 1.4.5
         tags.datadoghq.com/service: rollout-app
         tags.datadoghq.com/version: latest
         sidecar.istio.io/inject: "true"
@@ -761,7 +761,7 @@
 metadata:
   name: "rollout-app-test-connection"
   labels:
-    helm.sh/chart: rollout-app-1.4.4
+    helm.sh/chart: rollout-app-1.4.5
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "rollout-app"
```

```diff
$ diff -u -b orig new
--- orig	2024-12-03 17:20:58
+++ new	2024-12-03 17:17:13
@@ -5,10 +5,10 @@
 ...Successfully got an update from the "codimd" chart repository
 ...Successfully got an update from the "kedacore" chart repository
 ...Successfully got an update from the "strimzi" chart repository
-...Successfully got an update from the "k8s-charts" chart repository
 ...Successfully got an update from the "jetstack" chart repository
-...Successfully got an update from the "argo" chart repository
+...Successfully got an update from the "k8s-charts" chart repository
 ...Successfully got an update from the "fairwinds-stable" chart repository
+...Successfully got an update from the "argo" chart repository
 Update Complete. ⎈Happy Helming!⎈
 Saving 1 charts
 Deleting outdated charts
@@ -20,7 +20,7 @@
 metadata:
   name: daemonset-app-ingress
   labels:
-    helm.sh/chart: daemonset-app-0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "daemonset-app"
@@ -50,9 +50,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: daemonset-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: daemonset-app-0.16.1
-    helm.sh/chartName: daemonset-app
-    helm.sh/chartVersion: 0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
+    helm.sh/chart-name: daemonset-app
+    helm.sh/chart-version: 0.16.2
     tags.datadoghq.com/service: daemonset-app
     tags.datadoghq.com/version: latest
 ---
@@ -62,7 +62,7 @@
 metadata:
   name: daemonset-app
   labels:
-    helm.sh/chart: daemonset-app-0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "daemonset-app"
@@ -91,7 +91,7 @@
 metadata:
   name: daemonset-app-metrics
   labels:
-    helm.sh/chart: daemonset-app-0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "daemonset-app"
@@ -120,9 +120,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: daemonset-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: daemonset-app-0.16.1
-    helm.sh/chartName: daemonset-app
-    helm.sh/chartVersion: 0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
+    helm.sh/chart-name: daemonset-app
+    helm.sh/chart-version: 0.16.2
     tags.datadoghq.com/service: daemonset-app
     tags.datadoghq.com/version: latest
 spec:
@@ -159,9 +159,9 @@
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: daemonset-app
         app.kubernetes.io/version: latest
-        helm.sh/chart: daemonset-app-0.16.1
-        helm.sh/chartName: daemonset-app
-        helm.sh/chartVersion: 0.16.1
+        helm.sh/chart: daemonset-app-0.16.2
+        helm.sh/chart-name: daemonset-app
+        helm.sh/chart-version: 0.16.2
         tags.datadoghq.com/service: daemonset-app
         tags.datadoghq.com/version: latest
         sidecar.istio.io/inject: "false"
@@ -236,9 +236,9 @@
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: daemonset-app
     app.kubernetes.io/version: latest
-    helm.sh/chart: daemonset-app-0.16.1
-    helm.sh/chartName: daemonset-app
-    helm.sh/chartVersion: 0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
+    helm.sh/chart-name: daemonset-app
+    helm.sh/chart-version: 0.16.2
     tags.datadoghq.com/service: daemonset-app
     tags.datadoghq.com/version: latest
 spec:
@@ -436,7 +436,7 @@
 metadata:
   name: daemonset-app-monitor-rules
   labels:
-    helm.sh/chart: daemonset-app-0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "daemonset-app"
@@ -460,7 +460,7 @@
 metadata:
   name: daemonset-app
   labels:
-    helm.sh/chart: daemonset-app-0.16.1
+    helm.sh/chart: daemonset-app-0.16.2
     app.kubernetes.io/version: "latest"
     app.kubernetes.io/managed-by: Helm
     tags.datadoghq.com/service: "daemonset-app"
```

Co-authored-by: Cloudeng <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants