From 12effd60b05b0c2cec50c49c512b5e88e9bad537 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Sun, 10 Nov 2024 18:09:15 -0500 Subject: [PATCH] Remove empty `shortnames: []` from HTTPLocalRateLimitPolicy ArgoCD is not compatible with an empty `shortnames` entry. (We encountered this same issue in the past with ExternalWorkloads: #12793) Fixes #13295 --- .../templates/policy/http-local-ratelimit-policy.yaml | 1 - cli/cmd/testdata/install_crds.golden | 1 - cli/cmd/testdata/install_helm_crds_output.golden | 1 - cli/cmd/testdata/install_helm_crds_output_ha.golden | 1 - 4 files changed, 4 deletions(-) diff --git a/charts/linkerd-crds/templates/policy/http-local-ratelimit-policy.yaml b/charts/linkerd-crds/templates/policy/http-local-ratelimit-policy.yaml index c2752191c1934..6ed6b6622ef7b 100644 --- a/charts/linkerd-crds/templates/policy/http-local-ratelimit-policy.yaml +++ b/charts/linkerd-crds/templates/policy/http-local-ratelimit-policy.yaml @@ -15,7 +15,6 @@ spec: listKind: HTTPLocalRateLimitPolicyList plural: httplocalratelimitpolicies singular: httplocalratelimitpolicy - shortNames: [] scope: Namespaced versions: - name: v1alpha1 diff --git a/cli/cmd/testdata/install_crds.golden b/cli/cmd/testdata/install_crds.golden index 3d27ea04a0f7e..1b9858fec5cc3 100644 --- a/cli/cmd/testdata/install_crds.golden +++ b/cli/cmd/testdata/install_crds.golden @@ -237,7 +237,6 @@ spec: listKind: HTTPLocalRateLimitPolicyList plural: httplocalratelimitpolicies singular: httplocalratelimitpolicy - shortNames: [] scope: Namespaced versions: - name: v1alpha1 diff --git a/cli/cmd/testdata/install_helm_crds_output.golden b/cli/cmd/testdata/install_helm_crds_output.golden index 3d4e7f43fb99c..1227d24698195 100644 --- a/cli/cmd/testdata/install_helm_crds_output.golden +++ b/cli/cmd/testdata/install_helm_crds_output.golden @@ -243,7 +243,6 @@ spec: listKind: HTTPLocalRateLimitPolicyList plural: httplocalratelimitpolicies singular: httplocalratelimitpolicy - shortNames: [] scope: Namespaced versions: - name: v1alpha1 diff --git a/cli/cmd/testdata/install_helm_crds_output_ha.golden b/cli/cmd/testdata/install_helm_crds_output_ha.golden index 3d4e7f43fb99c..1227d24698195 100644 --- a/cli/cmd/testdata/install_helm_crds_output_ha.golden +++ b/cli/cmd/testdata/install_helm_crds_output_ha.golden @@ -243,7 +243,6 @@ spec: listKind: HTTPLocalRateLimitPolicyList plural: httplocalratelimitpolicies singular: httplocalratelimitpolicy - shortNames: [] scope: Namespaced versions: - name: v1alpha1