Improved Kubernetes publisher labels

src/Aspire.Hosting.Kubernetes/Extensions/HelmExtensions.cs

@@ -27,13 +27,13 @@ public static string ToHelmValuesSectionName(this string resourceName)
         => $"{resourceName.Replace("-", "_")}";
 
     public static string ToHelmParameterExpression(this string parameterName, string resourceName)
-        => $"{{{{ {ValuesSegment}.{ParametersKey}.{resourceName.ToHelmValuesSectionName()}.{parameterName} }}}}";
+        => $"{{{{ {ValuesSegment}.{ParametersKey}.{resourceName}.{parameterName} }}}}".ToHelmValuesSectionName();
 
     public static string ToHelmSecretExpression(this string parameterName, string resourceName)
-        => $"{{{{ {ValuesSegment}.{SecretsKey}.{resourceName.ToHelmValuesSectionName()}.{parameterName} }}}}";
+        => $"{{{{ {ValuesSegment}.{SecretsKey}.{resourceName}.{parameterName} }}}}".ToHelmValuesSectionName();
 
     public static string ToHelmConfigExpression(this string parameterName, string resourceName)
-        => $"{{{{ {ValuesSegment}.{ConfigKey}.{resourceName.ToHelmValuesSectionName()}.{parameterName} }}}}";
+        => $"{{{{ {ValuesSegment}.{ConfigKey}.{resourceName}.{parameterName} }}}}".ToHelmValuesSectionName();
 
     /// <summary>
     /// Converts the specified resource name into a Kubernetes resource name.

src/Aspire.Hosting.Kubernetes/Extensions/ResourceExtensions.cs

@@ -15,6 +15,7 @@ internal static Deployment ToDeployment(this IResource resource, KubernetesResou
             Metadata =
             {
                 Name = resource.Name.ToDeploymentName(),
+                Labels = context.Labels.ToDictionary(),
             },
             Spec =
             {
@@ -43,6 +44,7 @@ internal static StatefulSet ToStatefulSet(this IResource resource, KubernetesRes
             Metadata =
             {
                 Name = resource.Name.ToStatefulSetName(),
+                Labels = context.Labels.ToDictionary(),
             },
             Spec =
             {
@@ -125,6 +127,7 @@ internal static StatefulSet ToStatefulSet(this IResource resource, KubernetesRes
             Metadata =
             {
                 Name = resource.Name.ToServiceName(),
+                Labels = context.Labels.ToDictionary(),
             },
             Spec =
             {

src/Aspire.Hosting.Kubernetes/KubernetesResource.cs

@@ -88,6 +88,11 @@ internal IEnumerable<BaseKubernetesResource> GetTemplatedResources()
 
         foreach (var resource in AdditionalResources)
         {
+            foreach(var label in Labels)
+            {
+                resource.Metadata.Labels.TryAdd(label.Key, label.Value);
+            }
+
             yield return resource;
         }
     }
@@ -105,8 +110,9 @@ private void SetLabels()
     {
         Labels = new()
         {
-            ["app"] = "aspire",
-            ["component"] = resource.Name,
+            ["app.kubernetes.io/name"] = Parent.HelmChartName,
+            ["app.kubernetes.io/component"] = resource.Name,
+            ["app.kubernetes.io/instance"] = "{{.Release.Name}}",
         };
     }
 

tests/Aspire.Hosting.Kubernetes.Tests/KubernetesPublisherTests.cs

@@ -176,7 +176,7 @@ public async Task PublishAsync_HandlesSpecialResourceName()
         using var tempDir = new TempDirectory();
         var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish, "default", outputPath: tempDir.Path);
 
-        builder.AddKubernetesEnvironment("env");
+        builder.AddKubernetesEnvironment("env").Resource.HelmChartName = "my-chart";
 
         var param0 = builder.AddParameter("param0");
         var param1 = builder.AddParameter("param1", secret: true);

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesEnvironmentResourceTests.MultipleKubernetesEnvironmentsSupported/env1/templates/ServiceA/config.verified.yaml

@@ -4,8 +4,9 @@ kind: "ConfigMap"
 metadata:
   name: "servicea-config"
   labels:
-    app: "aspire"
-    component: "ServiceA"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceA"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 data:
   ASPNETCORE_URLS: "{{ .Values.config.ServiceA.ASPNETCORE_URLS }}"
   OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES: "{{ .Values.config.ServiceA.OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES }}"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesEnvironmentResourceTests.MultipleKubernetesEnvironmentsSupported/env1/templates/ServiceA/deployment.verified.yaml

@@ -3,12 +3,17 @@ apiVersion: "apps/v1"
 kind: "Deployment"
 metadata:
   name: "servicea-deployment"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceA"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   template:
     metadata:
       labels:
-        app: "aspire"
-        component: "ServiceA"
+        app.kubernetes.io/name: "aspire"
+        app.kubernetes.io/component: "ServiceA"
+        app.kubernetes.io/instance: "{{.Release.Name}}"
     spec:
       containers:
         - image: "{{ .Values.parameters.ServiceA.ServiceA_image }}"
@@ -26,8 +31,9 @@ spec:
           imagePullPolicy: "IfNotPresent"
   selector:
     matchLabels:
-      app: "aspire"
-      component: "ServiceA"
+      app.kubernetes.io/name: "aspire"
+      app.kubernetes.io/component: "ServiceA"
+      app.kubernetes.io/instance: "{{.Release.Name}}"
   replicas: 1
   revisionHistoryLimit: 3
   strategy:

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesEnvironmentResourceTests.MultipleKubernetesEnvironmentsSupported/env1/templates/ServiceA/service.verified.yaml

@@ -3,11 +3,16 @@ apiVersion: "v1"
 kind: "Service"
 metadata:
   name: "servicea-service"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceA"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   type: "ClusterIP"
   selector:
-    app: "aspire"
-    component: "ServiceA"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceA"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
   ports:
     - name: "http"
       protocol: "TCP"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesEnvironmentResourceTests.MultipleKubernetesEnvironmentsSupported/env2/templates/ServiceB/config.verified.yaml

@@ -4,8 +4,9 @@ kind: "ConfigMap"
 metadata:
   name: "serviceb-config"
   labels:
-    app: "aspire"
-    component: "ServiceB"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceB"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 data:
   ASPNETCORE_URLS: "{{ .Values.config.ServiceB.ASPNETCORE_URLS }}"
   OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES: "{{ .Values.config.ServiceB.OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES }}"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesEnvironmentResourceTests.MultipleKubernetesEnvironmentsSupported/env2/templates/ServiceB/deployment.verified.yaml

@@ -3,12 +3,17 @@ apiVersion: "apps/v1"
 kind: "Deployment"
 metadata:
   name: "serviceb-deployment"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceB"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   template:
     metadata:
       labels:
-        app: "aspire"
-        component: "ServiceB"
+        app.kubernetes.io/name: "aspire"
+        app.kubernetes.io/component: "ServiceB"
+        app.kubernetes.io/instance: "{{.Release.Name}}"
     spec:
       containers:
         - image: "{{ .Values.parameters.ServiceB.ServiceB_image }}"
@@ -26,8 +31,9 @@ spec:
           imagePullPolicy: "IfNotPresent"
   selector:
     matchLabels:
-      app: "aspire"
-      component: "ServiceB"
+      app.kubernetes.io/name: "aspire"
+      app.kubernetes.io/component: "ServiceB"
+      app.kubernetes.io/instance: "{{.Release.Name}}"
   replicas: 1
   revisionHistoryLimit: 3
   strategy:

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesEnvironmentResourceTests.MultipleKubernetesEnvironmentsSupported/env2/templates/ServiceB/service.verified.yaml

@@ -3,11 +3,16 @@ apiVersion: "v1"
 kind: "Service"
 metadata:
   name: "serviceb-service"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceB"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   type: "ClusterIP"
   selector:
-    app: "aspire"
-    component: "ServiceB"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "ServiceB"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
   ports:
     - name: "http"
       protocol: "TCP"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesEnvironmentResourceTests.PublishingKubernetesEnvironmentPublishesFile#02.verified.yaml

@@ -3,21 +3,27 @@ apiVersion: "apps/v1"
 kind: "Deployment"
 metadata:
   name: "service-deployment"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "service"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   template:
     metadata:
       labels:
-        app: "aspire"
-        component: "service"
+        app.kubernetes.io/name: "aspire"
+        app.kubernetes.io/component: "service"
+        app.kubernetes.io/instance: "{{.Release.Name}}"
     spec:
       containers:
         - image: "nginx:latest"
           name: "service"
           imagePullPolicy: "IfNotPresent"
   selector:
     matchLabels:
-      app: "aspire"
-      component: "service"
+      app.kubernetes.io/name: "aspire"
+      app.kubernetes.io/component: "service"
+      app.kubernetes.io/instance: "{{.Release.Name}}"
   replicas: 1
   revisionHistoryLimit: 3
   strategy:

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesPublisherTests.PublishAppliesServiceCustomizations.verified.yaml

@@ -3,12 +3,17 @@ apiVersion: "apps/v1"
 kind: "Deployment"
 metadata:
   name: "service-deployment"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "service"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   template:
     metadata:
       labels:
-        app: "aspire"
-        component: "service"
+        app.kubernetes.io/name: "aspire"
+        app.kubernetes.io/component: "service"
+        app.kubernetes.io/instance: "{{.Release.Name}}"
     spec:
       containers:
         - image: "nginx:latest"
@@ -19,8 +24,9 @@ spec:
           imagePullPolicy: "Always"
   selector:
     matchLabels:
-      app: "aspire"
-      component: "service"
+      app.kubernetes.io/name: "aspire"
+      app.kubernetes.io/component: "service"
+      app.kubernetes.io/instance: "{{.Release.Name}}"
   replicas: 1
   revisionHistoryLimit: 5
   strategy:

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesPublisherTests.PublishAsync_CustomWorkloadAndResourceType#02.verified.yaml

@@ -4,15 +4,17 @@ kind: "Rollout"
 metadata:
   name: "myapp-rollout"
   labels:
-    app: "aspire"
-    component: "myapp"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "myapp"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        app: "aspire"
-        component: "myapp"
+        app.kubernetes.io/name: "aspire"
+        app.kubernetes.io/component: "myapp"
+        app.kubernetes.io/instance: "{{.Release.Name}}"
     spec:
       containers:
         - image: "mcr.microsoft.com/dotnet/aspnet:8.0"
@@ -27,5 +29,6 @@ spec:
           imagePullPolicy: "IfNotPresent"
   selector:
     matchLabels:
-      app: "aspire"
-      component: "myapp"
+      app.kubernetes.io/name: "aspire"
+      app.kubernetes.io/component: "myapp"
+      app.kubernetes.io/instance: "{{.Release.Name}}"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesPublisherTests.PublishAsync_CustomWorkloadAndResourceType#03.verified.yaml

@@ -3,11 +3,16 @@ apiVersion: "v1"
 kind: "Service"
 metadata:
   name: "myapp-service"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "myapp"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   type: "ClusterIP"
   selector:
-    app: "aspire"
-    component: "myapp"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "myapp"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
   ports:
     - name: "http"
       protocol: "TCP"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesPublisherTests.PublishAsync_CustomWorkloadAndResourceType#04.verified.yaml

@@ -4,7 +4,8 @@ kind: "ConfigMap"
 metadata:
   name: "myapp-config"
   labels:
-    app: "aspire"
-    component: "myapp"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "myapp"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 data:
   ASPNETCORE_ENVIRONMENT: "{{ .Values.config.myapp.ASPNETCORE_ENVIRONMENT }}"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesPublisherTests.PublishAsync_CustomWorkloadAndResourceType#05.verified.yaml

@@ -3,6 +3,10 @@ apiVersion: "keda.sh/v1alpha1"
 kind: "ScaledObject"
 metadata:
   name: "myapp-scaler"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "myapp"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   scaleTargetRef:
     name: "myapp-rollout"

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesPublisherTests.PublishAsync_GeneratesValidHelmChart#02.verified.yaml

@@ -3,12 +3,17 @@ apiVersion: "apps/v1"
 kind: "Deployment"
 metadata:
   name: "project1-deployment"
+  labels:
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "project1"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 spec:
   template:
     metadata:
       labels:
-        app: "aspire"
-        component: "project1"
+        app.kubernetes.io/name: "aspire"
+        app.kubernetes.io/component: "project1"
+        app.kubernetes.io/instance: "{{.Release.Name}}"
     spec:
       containers:
         - image: "{{ .Values.parameters.project1.project1_image }}"
@@ -19,8 +24,9 @@ spec:
           imagePullPolicy: "IfNotPresent"
   selector:
     matchLabels:
-      app: "aspire"
-      component: "project1"
+      app.kubernetes.io/name: "aspire"
+      app.kubernetes.io/component: "project1"
+      app.kubernetes.io/instance: "{{.Release.Name}}"
   replicas: 1
   revisionHistoryLimit: 3
   strategy:

tests/Aspire.Hosting.Kubernetes.Tests/Snapshots/KubernetesPublisherTests.PublishAsync_GeneratesValidHelmChart#03.verified.yaml

@@ -4,8 +4,9 @@ kind: "ConfigMap"
 metadata:
   name: "project1-config"
   labels:
-    app: "aspire"
-    component: "project1"
+    app.kubernetes.io/name: "aspire"
+    app.kubernetes.io/component: "project1"
+    app.kubernetes.io/instance: "{{.Release.Name}}"
 data:
   OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES: "{{ .Values.config.project1.OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES }}"
   OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "{{ .Values.config.project1.OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES }}"