From 4ec0bd019d4596da1509b24ddff1cb32aeda691e Mon Sep 17 00:00:00 2001 From: shinigami-777 Date: Sat, 23 Dec 2023 12:56:22 +0530 Subject: [PATCH] Added the new naming suggested and regenerated the helm values documentation in charts README.md files Signed-off-by: shinigami-777 --- jaeger/charts/linkerd-jaeger/README.md | 1 + .../linkerd-jaeger/templates/namespace-metadata-rbac.yaml | 2 +- .../charts/linkerd-jaeger/templates/namespace-metadata.yaml | 2 +- jaeger/charts/linkerd-jaeger/values.yaml | 5 +++-- multicluster/charts/linkerd-multicluster/README.md | 1 + .../templates/namespace-metadata-rbac.yaml | 2 +- .../linkerd-multicluster/templates/namespace-metadata.yaml | 2 +- multicluster/charts/linkerd-multicluster/values.yaml | 5 +++-- viz/charts/linkerd-viz/README.md | 1 + .../linkerd-viz/templates/namespace-metadata-rbac.yaml | 2 +- viz/charts/linkerd-viz/templates/namespace-metadata.yaml | 2 +- viz/charts/linkerd-viz/values.yaml | 5 +++-- 12 files changed, 18 insertions(+), 12 deletions(-) diff --git a/jaeger/charts/linkerd-jaeger/README.md b/jaeger/charts/linkerd-jaeger/README.md index 0bf6640795ee9..5a63566dd1321 100644 --- a/jaeger/charts/linkerd-jaeger/README.md +++ b/jaeger/charts/linkerd-jaeger/README.md @@ -91,6 +91,7 @@ Kubernetes: `>=1.22.0-0` | collector.resources.memory.request | string | `nil` | Amount of memory that the collector container requests | | collector.tolerations | string | `nil` | Tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information | | commonLabels | object | `{}` | Labels to apply to all resources | +| createNamespaceMetadataJobs | bool | `true` | Creates a Job that adds necessary metadata to the extension's namespace during install; disable if lack of privileges require doing this manually | | defaultUID | int | `2103` | Default UID for all the jaeger components | | enablePSP | bool | `false` | Create Roles and RoleBindings to associate this extension's ServiceAccounts to the control plane PSP resource. This requires that `enabledPSP` is set to true on the control plane install. Note PSP has been deprecated since k8s v1.21 | | enablePodAntiAffinity | bool | `false` | Enables Pod Anti Affinity logic to balance the placement of replicas across hosts and zones for High Availability. Enable this only when you have multiple replicas of components. | diff --git a/jaeger/charts/linkerd-jaeger/templates/namespace-metadata-rbac.yaml b/jaeger/charts/linkerd-jaeger/templates/namespace-metadata-rbac.yaml index d7543fbf5e075..1399a73fc2917 100644 --- a/jaeger/charts/linkerd-jaeger/templates/namespace-metadata-rbac.yaml +++ b/jaeger/charts/linkerd-jaeger/templates/namespace-metadata-rbac.yaml @@ -1,5 +1,5 @@ --- -{{- if not .Values.skipNamespaceMetadataJobs}} +{{- if .Values.createNamespaceMetadataJobs}} kind: ServiceAccount apiVersion: v1 metadata: diff --git a/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml b/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml index fe0440deea199..d00308462d040 100644 --- a/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml +++ b/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml @@ -1,5 +1,5 @@ --- -{{- if not .Values.skipNamespaceMetadataJobs}} +{{- if .Values.createNamespaceMetadataJobs}} apiVersion: batch/v1 kind: Job metadata: diff --git a/jaeger/charts/linkerd-jaeger/values.yaml b/jaeger/charts/linkerd-jaeger/values.yaml index 0505f6586ae3f..e96dcb47f9000 100644 --- a/jaeger/charts/linkerd-jaeger/values.yaml +++ b/jaeger/charts/linkerd-jaeger/values.yaml @@ -32,8 +32,9 @@ enablePodAntiAffinity: false # for more information #nodeAffinity: -# -- adding an option to disble namespace-metadata jobs -skipNamespaceMetadataJobs: false +# -- Creates a Job that adds necessary metadata to the extension's namespace +# during install; disable if lack of privileges require doing this manually +createNamespaceMetadataJobs: true # -- Create Roles and RoleBindings to associate this extension's # ServiceAccounts to the control plane PSP resource. This requires that diff --git a/multicluster/charts/linkerd-multicluster/README.md b/multicluster/charts/linkerd-multicluster/README.md index 38a02d9ddbff8..49e077271d4cd 100644 --- a/multicluster/charts/linkerd-multicluster/README.md +++ b/multicluster/charts/linkerd-multicluster/README.md @@ -71,6 +71,7 @@ Kubernetes: `>=1.22.0-0` | Key | Type | Default | Description | |-----|------|---------|-------------| | commonLabels | object | `{}` | Labels to apply to all resources | +| createNamespaceMetadataJobs | bool | `true` | Creates a Job that adds necessary metadata to the extension's namespace during install; disable if lack of privileges require doing this manually | | enablePSP | bool | `false` | Create Roles and RoleBindings to associate this extension's ServiceAccounts to the control plane PSP resource. This requires that `enabledPSP` is set to true on the control plane install. Note PSP has been deprecated since k8s v1.21 | | enablePodAntiAffinity | bool | `false` | Enables Pod Anti Affinity logic to balance the placement of replicas across hosts and zones for High Availability. Enable this only when you have multiple replicas of components. | | gateway.UID | int | `2103` | User id under which the gateway shall be ran | diff --git a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml index a16cde74159a4..7a7d28db9a270 100644 --- a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml +++ b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.skipNamespaceMetadataJobs}} +{{- if .Values.createNamespaceMetadataJobs}} kind: ServiceAccount apiVersion: v1 metadata: diff --git a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml index fc10f53ab4402..7a83071870b3b 100644 --- a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml +++ b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.skipNamespaceMetadataJobs}} +{{- if .Values.createNamespaceMetadataJobs}} apiVersion: batch/v1 kind: Job metadata: diff --git a/multicluster/charts/linkerd-multicluster/values.yaml b/multicluster/charts/linkerd-multicluster/values.yaml index 1df6e0b17d3a3..948a04a997cb8 100644 --- a/multicluster/charts/linkerd-multicluster/values.yaml +++ b/multicluster/charts/linkerd-multicluster/values.yaml @@ -99,5 +99,6 @@ enablePodAntiAffinity: false # for more information # nodeAffinity: -# -- adding an option to disble namespace-metadata jobs -skipNamespaceMetadataJobs: false +# -- Creates a Job that adds necessary metadata to the extension's namespace +# during install; disable if lack of privileges require doing this manually +createNamespaceMetadataJobs: true diff --git a/viz/charts/linkerd-viz/README.md b/viz/charts/linkerd-viz/README.md index bd9750494b49b..7381988948d8f 100644 --- a/viz/charts/linkerd-viz/README.md +++ b/viz/charts/linkerd-viz/README.md @@ -72,6 +72,7 @@ Kubernetes: `>=1.22.0-0` |-----|------|---------|-------------| | clusterDomain | string | `"cluster.local"` | Kubernetes DNS Domain name to use | | commonLabels | object | `{}` | Labels to apply to all resources | +| createNamespaceMetadataJobs | bool | `true` | Creates a Job that adds necessary metadata to the extension's namespace during install; disable if lack of privileges require doing this manually | | dashboard.UID | string | `nil` | UID for the dashboard resource | | dashboard.enforcedHostRegexp | string | `""` | Host header validation regex for the dashboard. See the [Linkerd documentation](https://linkerd.io/2/tasks/exposing-dashboard) for more information | | dashboard.image.name | string | `"web"` | Docker image name for the web instance | diff --git a/viz/charts/linkerd-viz/templates/namespace-metadata-rbac.yaml b/viz/charts/linkerd-viz/templates/namespace-metadata-rbac.yaml index 7c8ebde27fce3..414bea78ac46c 100644 --- a/viz/charts/linkerd-viz/templates/namespace-metadata-rbac.yaml +++ b/viz/charts/linkerd-viz/templates/namespace-metadata-rbac.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.skipNamespaceMetadataJobs}} +{{- if .Values.createNamespaceMetadataJobs}} kind: ServiceAccount apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/namespace-metadata.yaml b/viz/charts/linkerd-viz/templates/namespace-metadata.yaml index f61a0e4906d65..ba39d76ef97b1 100644 --- a/viz/charts/linkerd-viz/templates/namespace-metadata.yaml +++ b/viz/charts/linkerd-viz/templates/namespace-metadata.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.skipNamespaceMetadataJobs}} +{{- if .Values.createNamespaceMetadataJobs}} apiVersion: batch/v1 kind: Job metadata: diff --git a/viz/charts/linkerd-viz/values.yaml b/viz/charts/linkerd-viz/values.yaml index da516768b167f..889b432a23518 100644 --- a/viz/charts/linkerd-viz/values.yaml +++ b/viz/charts/linkerd-viz/values.yaml @@ -58,8 +58,9 @@ enablePodDisruptionBudget: false # for more information # nodeAffinity: -# -- adding an option to disble namespace-metadata jobs -skipNamespaceMetadataJobs: false +# -- Creates a Job that adds necessary metadata to the extension's namespace +# during install; disable if lack of privileges require doing this manually +createNamespaceMetadataJobs: true # -- Create Roles and RoleBindings to associate this extension's # ServiceAccounts to the control plane PSP resource. This requires that