[helm] remove unsupported Release fields for publishing the chart as …

…an EKS addon (#6079) (cherry picked from commit 5cd2518) # Conflicts: # deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml # deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
elastic · Nov 20, 2024 · 4855657 · 4855657
1 parent 4aa845f
commit 4855657
Show file tree

Hide file tree

Showing 12 changed files with 373 additions and 6 deletions.
diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -9,8 +9,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -24,8 +28,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -39,8 +47,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -54,8 +66,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -107,8 +123,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -397,8 +417,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -575,8 +599,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -700,8 +728,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -934,8 +966,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -1017,8 +1053,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1039,8 +1079,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1061,8 +1105,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1084,8 +1132,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
@@ -1187,8 +1239,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
@@ -1256,8 +1312,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:

diff --git a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
@@ -9,8 +9,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -22,8 +26,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
 stringData:
 
   agent.yml: |-
@@ -43,8 +51,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -150,8 +162,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
 subjects:
   - kind: ServiceAccount
     name: agent-nginx-example
@@ -171,8 +187,12 @@ metadata:
     helm.sh/chart: elastic-agent-0.0.1
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
+<<<<<<< HEAD
     app.kubernetes.io/version: 8.17.0
     app.kubernetes.io/managed-by: Helm
+=======
+    app.kubernetes.io/version: 9.0.0
+>>>>>>> 5cd2518b4e ([helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079))
 spec:
   selector:
     matchLabels: