diff --git a/README.md b/README.md index d48c31ccf..0ce709947 100644 --- a/README.md +++ b/README.md @@ -129,9 +129,9 @@ helm upgrade traefik traefik/traefik > you **have** to change ownership on CRDs **before** installing CRDs chart ```bash -kubectl get customresourcedefinitions.apiextensions.k8s.io -o name | grep traefik.io | xargs kubectl patch --type='json' -p='[{"op": "add", "path": "/metadata/labels", "value": {"app.kubernetes.io/managed-by":"Helm"}},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-name", "value":"traefik-crds"},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-namespace", "value":"traefik-crds"}]' +kubectl get customresourcedefinitions.apiextensions.k8s.io -o name | grep traefik.io | xargs kubectl patch --type='json' -p='[{"op": "add", "path": "/metadata/labels", "value": {"app.kubernetes.io/managed-by":"Helm"}},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-name", "value":"traefik-crds"},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-namespace", "value":"default"}]' # If you use gateway API, you might also want to change Gateway API ownership -kubectl get customresourcedefinitions.apiextensions.k8s.io -o name | grep gateway.networking.k8s.io | xargs kubectl patch --type='json' -p='[{"op": "add", "path": "/metadata/labels", "value": {"app.kubernetes.io/managed-by":"Helm"}},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-name", "value":"traefik-crds"},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-namespace", "value":"traefik"}]' +kubectl get customresourcedefinitions.apiextensions.k8s.io -o name | grep gateway.networking.k8s.io | xargs kubectl patch --type='json' -p='[{"op": "add", "path": "/metadata/labels", "value": {"app.kubernetes.io/managed-by":"Helm"}},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-name", "value":"traefik-crds"},{"op": "add", "path": "/metadata/annotations/meta.helm.sh~1release-namespace", "value":"default"}]' helm install traefik-crds traefik/traefik-crds ``` diff --git a/traefik-crds/templates/_helpers.tpl b/traefik-crds/templates/_helpers.tpl index 6342768ef..e67b96cb2 100644 --- a/traefik-crds/templates/_helpers.tpl +++ b/traefik-crds/templates/_helpers.tpl @@ -12,9 +12,7 @@ Render CRDs file. {{- $labelsAndAnnotations := (dict "metadata" (dict "annotations" (dict - "app.kubernetes.io/managed-by" "Helm" - "meta.helm.sh/release-name" $scope.Release.Name - "meta.helm.sh/release-namespace" $scope.Release.Namespace + "app.kubernetes.io/managed-by" "Helm" ) "labels" (dict "app.kubernetes.io/managed-by" "Helm"