[8.16](backport #6079) [helm] remove unsupported Release fields for p…

…ublishing the chart as EKS addon (#6093) * [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 * fix: resolve conflicts --------- Co-authored-by: Panos Koutsovasilis <[email protected]>
elastic · Nov 20, 2024 · 730233b · 730233b
1 parent ce93cd9
commit 730233b
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 99 deletions.
diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -10,7 +10,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -25,7 +24,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -40,7 +38,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -55,7 +52,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -108,7 +104,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -398,7 +393,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -576,7 +570,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -701,7 +694,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -935,7 +927,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -1018,7 +1009,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1040,7 +1030,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1062,7 +1051,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1085,7 +1073,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
@@ -1188,7 +1175,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
@@ -1257,7 +1243,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
   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
@@ -10,7 +10,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -23,7 +22,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 stringData:
 
   agent.yml: |-
@@ -44,7 +42,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -151,7 +148,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
     name: agent-nginx-example
@@ -172,7 +168,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 spec:
   selector:
     matchLabels:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -10,7 +10,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -23,7 +22,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -36,7 +34,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -49,7 +46,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 stringData:
 
   agent.yml: |-
@@ -107,7 +103,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 stringData:
 
   agent.yml: |-
@@ -402,7 +397,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 stringData:
 
   agent.yml: |-
@@ -585,7 +579,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -708,7 +701,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -940,7 +932,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -1021,7 +1012,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -1041,7 +1031,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
     name: agent-ksmsharded-example
@@ -1061,7 +1050,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -1082,7 +1070,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 spec:
   selector:
     matchLabels:
@@ -1202,7 +1189,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 spec:
   selector:
     matchLabels:
@@ -1284,7 +1270,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 spec:
   selector:
     matchLabels:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
@@ -10,7 +10,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -23,7 +22,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -36,7 +34,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -49,7 +46,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 stringData:
 
   agent.yml: |-
@@ -107,7 +103,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 stringData:
 
   agent.yml: |-
@@ -402,7 +397,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 stringData:
 
   agent.yml: |-
@@ -587,7 +581,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -710,7 +703,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -942,7 +934,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -1023,7 +1014,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -1043,7 +1033,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
     name: agent-ksmsharded-example
@@ -1063,7 +1052,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -1084,7 +1072,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 spec:
   selector:
     matchLabels:
@@ -1229,7 +1216,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 spec:
   selector:
     matchLabels:
@@ -1311,7 +1297,6 @@ metadata:
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.16.1
-    app.kubernetes.io/managed-by: Helm
 spec:
   selector:
     matchLabels: