From 4855657d61a41c2e8e449267008455d2ff9ccfc2 Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Wed, 20 Nov 2024 14:21:20 +0200 Subject: [PATCH] [helm] remove unsupported Release fields for publishing the chart as an EKS addon (#6079) (cherry picked from commit 5cd2518b4ee4fa970f5b7884e91653adfe7965af) # 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 --- .../examples/eck/rendered/manifest.yaml | 60 +++++++++++++++++++ .../fleet-managed/rendered/manifest.yaml | 20 +++++++ .../kubernetes-default/rendered/manifest.yaml | 60 +++++++++++++++++++ .../rendered/manifest.yaml | 60 +++++++++++++++++++ .../rendered/manifest.yaml | 20 +++++++ .../rendered/manifest.yaml | 60 +++++++++++++++++++ .../rendered/manifest.yaml | 8 +++ .../rendered/manifest.yaml | 20 +++++++ .../user-cluster-role/rendered/manifest.yaml | 16 +++++ .../rendered/manifest.yaml | 48 +++++++++++++++ deploy/helm/elastic-agent/templates/NOTES.txt | 6 +- .../templates/agent/_helpers.tpl | 1 - 12 files changed, 373 insertions(+), 6 deletions(-) diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml index 91f91a39dcc..61b2bca7f2c 100644 --- 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 index dd9a8584a0b..aa16ed4987f 100644 --- 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: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml index ecedf00b2e6..7ddad506ad1 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-default/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/service-account.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)) --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -35,8 +43,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 @@ -48,8 +60,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: |- @@ -106,8 +122,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: |- @@ -401,8 +421,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: |- @@ -584,8 +608,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: @@ -707,8 +735,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: @@ -939,8 +971,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: @@ -1020,8 +1056,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-clusterwide-example @@ -1040,8 +1080,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-ksmsharded-example @@ -1060,8 +1104,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-pernode-example @@ -1081,8 +1129,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: @@ -1201,8 +1253,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: @@ -1283,8 +1339,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: 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 index b370ae13b4d..b8a710f2a13 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/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/service-account.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)) --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -35,8 +43,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 @@ -48,8 +60,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: |- @@ -106,8 +122,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: |- @@ -401,8 +421,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: |- @@ -586,8 +610,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: @@ -709,8 +737,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: @@ -941,8 +973,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: @@ -1022,8 +1058,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-clusterwide-example @@ -1042,8 +1082,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-ksmsharded-example @@ -1062,8 +1106,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-pernode-example @@ -1083,8 +1131,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: @@ -1228,8 +1280,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: @@ -1310,8 +1366,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: diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml index 287be6e2604..13e5a8d1e5c 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/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: |- @@ -115,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)) rules: - apiGroups: [ "" ] # "" indicates the core API group resources: @@ -196,8 +208,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-pernode-example @@ -217,8 +233,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: diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml index 144adf36a4b..306d13f6a87 100644 --- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/multiple-integrations/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/service-account.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)) --- # Source: elastic-agent/templates/agent/service-account.yaml apiVersion: v1 @@ -35,8 +43,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 @@ -48,8 +60,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: |- @@ -132,8 +148,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: |- @@ -427,8 +447,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: |- @@ -612,8 +636,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: @@ -735,8 +763,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: @@ -967,8 +999,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: @@ -1048,8 +1084,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-clusterwide-example @@ -1068,8 +1108,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-ksmsharded-example @@ -1088,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)) subjects: - kind: ServiceAccount name: agent-pernode-example @@ -1109,8 +1157,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: @@ -1244,8 +1296,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: @@ -1316,8 +1372,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: diff --git a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml index 3df28a4d719..28b8c291b1e 100644 --- a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/nginx-custom-integration/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)) stringData: agent.yml: |- @@ -65,8 +69,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: diff --git a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml index 7764d008086..7b32e8f5edd 100644 --- a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/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: |- @@ -187,8 +195,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: @@ -268,8 +280,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-pernode-example @@ -289,8 +305,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: diff --git a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml index 194504c9390..be81dd643f4 100644 --- a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/user-cluster-role/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: elastic-agent.k8s.elastic.co/preset: nginx elastic-agent.k8s.elastic.co/sa: nginx @@ -25,8 +29,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: elastic-agent.k8s.elastic.co/preset: nginx stringData: @@ -82,8 +90,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: elastic-agent.k8s.elastic.co/preset: nginx subjects: @@ -105,8 +117,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: diff --git a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml index cda47420a28..16d14d6c79c 100644 --- a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/user-service-account/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)) stringData: agent.yml: |- @@ -67,8 +71,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: |- @@ -362,8 +370,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: |- @@ -545,8 +557,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: elastic-agent.k8s.elastic.co/cr: nginx rules: @@ -670,8 +686,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: elastic-agent.k8s.elastic.co/cr: nginx rules: @@ -904,8 +924,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: elastic-agent.k8s.elastic.co/cr: nginx rules: @@ -987,8 +1011,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: user-sa-clusterWide @@ -1007,8 +1035,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: user-sa-ksmSharded @@ -1027,8 +1059,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: user-sa-perNode @@ -1048,8 +1084,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: @@ -1168,8 +1208,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: @@ -1250,8 +1294,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: diff --git a/deploy/helm/elastic-agent/templates/NOTES.txt b/deploy/helm/elastic-agent/templates/NOTES.txt index 0b8587db0fb..61a13a819b3 100644 --- a/deploy/helm/elastic-agent/templates/NOTES.txt +++ b/deploy/helm/elastic-agent/templates/NOTES.txt @@ -1,9 +1,5 @@ {{- if gt (len $.Values.agent.presets) 0}} -{{- if $.Release.IsInstall }} -🙌 Release "{{ .Release.Name }}" is installed at "{{ $.Release.Namespace }}" namespace -{{- else if $.Release.IsUpgrade }} -🚀 Release "{{ .Release.Name }}" at "{{ $.Release.Namespace }}" namespace upgraded -{{- end }} +Release "{{ .Release.Name }}" is installed at "{{ $.Release.Namespace }}" namespace {{ if gt (len $.Values.agent.presets) 1 }} Installed agents: {{- else }} diff --git a/deploy/helm/elastic-agent/templates/agent/_helpers.tpl b/deploy/helm/elastic-agent/templates/agent/_helpers.tpl index 368a31c7e5a..01f246ff0b2 100644 --- a/deploy/helm/elastic-agent/templates/agent/_helpers.tpl +++ b/deploy/helm/elastic-agent/templates/agent/_helpers.tpl @@ -203,7 +203,6 @@ Common labels {{- define "elasticagent.labels" -}} helm.sh/chart: {{ include "elasticagent.chart" . }} {{ include "elasticagent.selectorLabels" . }} -app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} {{/*