diff --git a/charts/linkerd-crds/templates/policy/httproute.yaml b/charts/linkerd-crds/templates/policy/httproute.yaml index 7d11b5e2e..d8b49731d 100644 --- a/charts/linkerd-crds/templates/policy/httproute.yaml +++ b/charts/linkerd-crds/templates/policy/httproute.yaml @@ -2,9 +2,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - - creationTimestamp: null name: httproutes.policy.linkerd.io + annotations: + {{ include "partials.annotations.created-by" . }} + labels: + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + linkerd.io/control-plane-ns: {{.Release.Namespace}} spec: group: policy.linkerd.io names: diff --git a/cli/cmd/testdata/install_crds.golden b/cli/cmd/testdata/install_crds.golden index 5a365228a..41d72e1c1 100644 --- a/cli/cmd/testdata/install_crds.golden +++ b/cli/cmd/testdata/install_crds.golden @@ -101,9 +101,12 @@ spec: apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - - creationTimestamp: null name: httproutes.policy.linkerd.io + annotations: + linkerd.io/created-by: linkerd/cli dev-undefined + labels: + helm.sh/chart: linkerd-crds-1.5.0-edge + linkerd.io/control-plane-ns: linkerd spec: group: policy.linkerd.io names: diff --git a/cli/cmd/testdata/install_helm_crds_output.golden b/cli/cmd/testdata/install_helm_crds_output.golden index 7d763c007..44e93ef00 100644 --- a/cli/cmd/testdata/install_helm_crds_output.golden +++ b/cli/cmd/testdata/install_helm_crds_output.golden @@ -105,9 +105,12 @@ spec: apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - - creationTimestamp: null name: httproutes.policy.linkerd.io + annotations: + linkerd.io/created-by: linkerd/helm linkerd-version + labels: + helm.sh/chart: linkerd-crds- + linkerd.io/control-plane-ns: linkerd-dev spec: group: policy.linkerd.io names: diff --git a/cli/cmd/testdata/install_helm_crds_output_ha.golden b/cli/cmd/testdata/install_helm_crds_output_ha.golden index 7d763c007..44e93ef00 100644 --- a/cli/cmd/testdata/install_helm_crds_output_ha.golden +++ b/cli/cmd/testdata/install_helm_crds_output_ha.golden @@ -105,9 +105,12 @@ spec: apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - - creationTimestamp: null name: httproutes.policy.linkerd.io + annotations: + linkerd.io/created-by: linkerd/helm linkerd-version + labels: + helm.sh/chart: linkerd-crds- + linkerd.io/control-plane-ns: linkerd-dev spec: group: policy.linkerd.io names: