From aff1aabd3f43f19ec0ee302dbec64e4892ca96fb Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Mon, 28 Oct 2024 08:29:52 -0500 Subject: [PATCH] golden files updates --- ...install_controlplane_tracing_output.golden | 4 +- cli/cmd/testdata/install_crds.golden | 127 +++++++++++++++++ cli/cmd/testdata/install_custom_domain.golden | 4 +- .../testdata/install_custom_registry.golden | 4 +- cli/cmd/testdata/install_default.golden | 4 +- ...stall_default_override_dst_get_nets.golden | 4 +- cli/cmd/testdata/install_default_token.golden | 4 +- cli/cmd/testdata/install_gid_output.golden | 4 +- cli/cmd/testdata/install_ha_output.golden | 4 +- .../install_ha_with_overrides_output.golden | 4 +- .../install_heartbeat_disabled_output.golden | 4 +- .../install_helm_control_plane_output.golden | 4 +- ...nstall_helm_control_plane_output_ha.golden | 4 +- ...lm_control_plane_output_ha_with_gid.golden | 4 +- .../testdata/install_helm_crds_output.golden | 129 ++++++++++++++++++ .../install_helm_crds_output_ha.golden | 129 ++++++++++++++++++ .../install_helm_output_ha_labels.golden | 4 +- ...l_helm_output_ha_namespace_selector.golden | 4 +- .../testdata/install_no_init_container.golden | 4 +- cli/cmd/testdata/install_output.golden | 4 +- cli/cmd/testdata/install_proxy_ignores.golden | 4 +- cli/cmd/testdata/install_values_file.golden | 4 +- 22 files changed, 442 insertions(+), 19 deletions(-) diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index f298d177271b0..cb746abd7a692 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1342,7 +1344,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_crds.golden b/cli/cmd/testdata/install_crds.golden index f92f5f25c7d21..4bbb62825ff4a 100644 --- a/cli/cmd/testdata/install_crds.golden +++ b/cli/cmd/testdata/install_crds.golden @@ -223,6 +223,133 @@ spec: --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition +metadata: + name: httplocalratelimitpolicies.policy.linkerd.io + annotations: + linkerd.io/created-by: linkerd/cli dev-undefined + labels: + helm.sh/chart: linkerd-crds-0.0.0-undefined + linkerd.io/control-plane-ns: linkerd +spec: + group: policy.linkerd.io + names: + kind: HTTPLocalRateLimitPolicy + plural: httplocalratelimitpolicies + singular: httplocalratelimitpolicy + shortNames: [hlrlpolicy] + scope: Namespaced + versions: + - name: v1alpha1 + served: true + storage: true + subresources: + status: {} + schema: + openAPIV3Schema: + type: object + required: [spec] + properties: + spec: + type: object + required: [targetRef] + properties: + targetRef: + description: >- + TargetRef references a resource to which the rate limit + policy applies. Only Server is allowed. + type: object + required: [kind, name] + properties: + group: + description: >- + Group is the group of the referent. When empty, the + Kubernetes core API group is inferred. + maxLength: 253 + pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ + type: string + kind: + description: Kind is the kind of the referent. + maxLength: 63 + minLength: 1 + pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$ + type: string + name: + description: Name is the name of the referent. + maxLength: 253 + minLength: 1 + type: string + total: + description: >- + Overall rate-limit, which all traffic coming to this + target should abide. + If unset no overall limit is applied. + type: object + required: [requestsPerSecond] + properties: + requestsPerSecond: + format: int64 + type: integer + identity: + description: >- + Fairness for individual identities; each separate client, + grouped by identity, will have this rate-limit. The + requestsPerSecond value should be less than or equal to the + total requestsPerSecond (if set). + type: object + required: [requestsPerSecond] + properties: + requestsPerSecond: + format: int64 + type: integer + overrides: + description: >- + Overrides for traffic from a specific client. The + requestsPerSecond value should be less than or equal to the + total requestsPerSecond (if set). + type: array + items: + type: object + required: [requestsPerSecond, clientRefs] + properties: + requestsPerSecond: + format: int64 + type: integer + clientRefs: + type: array + items: + type: object + required: [kind, name] + properties: + group: + description: >- + Group is the group of the referent. When empty, the + Kubernetes core API group is inferred. + maxLength: 253 + pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ + type: string + kind: + description: Kind is the kind of the referent. + maxLength: 63 + minLength: 1 + pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$ + type: string + namespace: + description: >- + Namespace is the namespace of the referent. + When unspecified (or empty string), this refers to the + local namespace of the Policy. + maxLength: 63 + minLength: 1 + pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ + type: string + name: + description: Name is the name of the referent. + maxLength: 253 + minLength: 1 + type: string +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition metadata: name: httproutes.policy.linkerd.io annotations: diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 3569ddddb4538..de2c236520d57 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1341,7 +1343,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index e3533592a85c8..a78c5719799af 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1341,7 +1343,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 3569ddddb4538..de2c236520d57 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1341,7 +1343,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 0f9a680d3d210..f0793353ee6e0 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1341,7 +1343,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index 5f6e5eefd7c15..b3eb033584180 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1332,7 +1334,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index 4eea9b4246dca..22015b0c0a94e 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1345,7 +1347,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 68983ffec4dce..26830ba000c22 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1444,7 +1446,7 @@ spec: template: metadata: annotations: - checksum/config: 02b4e06690c7d152f22038a65218d7bd14f7afa20d872db332cdc66b5d8aa477 + checksum/config: b53320781231a300833e58dd60e59dfc76812535b6d8baceac8e9aebf532115f linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 31744bf6ec0b6..3a2fd9f35568a 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1444,7 +1446,7 @@ spec: template: metadata: annotations: - checksum/config: 02b4e06690c7d152f22038a65218d7bd14f7afa20d872db332cdc66b5d8aa477 + checksum/config: b53320781231a300833e58dd60e59dfc76812535b6d8baceac8e9aebf532115f linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index af250a3cbe4f0..67d3c43e927ad 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1272,7 +1274,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index 3e9ac80f1a631..56d4bb2e948ef 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -167,6 +167,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -210,6 +211,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1316,7 +1318,7 @@ spec: template: metadata: annotations: - checksum/config: a3ab7df29a1f48d7fb7479bacd63a866ae3679b1fe06d0b949018f212fcbd480 + checksum/config: 135a435d8eac25e6b0cb52bdcb59c99c293707c5ead497c969ab6a0fdbbd2017 linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index 7292e33f3b9f5..2cc1ab1c0b514 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -167,6 +167,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -210,6 +211,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1419,7 +1421,7 @@ spec: template: metadata: annotations: - checksum/config: 897be9c3f1c955b3a7624feb8435bd3eefd946a954634d04cf38d9c9813c5977 + checksum/config: 1c02562d84ed479248921e406146be0e36935c87b0d28a1c903c3b90a117cc5b linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden index 1ae526fcdf7a2..0bda0ba3ec908 100755 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden @@ -167,6 +167,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -210,6 +211,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1423,7 +1425,7 @@ spec: template: metadata: annotations: - checksum/config: 897be9c3f1c955b3a7624feb8435bd3eefd946a954634d04cf38d9c9813c5977 + checksum/config: 1c02562d84ed479248921e406146be0e36935c87b0d28a1c903c3b90a117cc5b linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_crds_output.golden b/cli/cmd/testdata/install_helm_crds_output.golden index 5985ca2e2920f..0a9b7f3ba6a80 100644 --- a/cli/cmd/testdata/install_helm_crds_output.golden +++ b/cli/cmd/testdata/install_helm_crds_output.golden @@ -225,6 +225,135 @@ spec: - status - type --- +# Source: linkerd-crds/templates/policy/http-local-ratelimit-policy.yaml +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: httplocalratelimitpolicies.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: + kind: HTTPLocalRateLimitPolicy + plural: httplocalratelimitpolicies + singular: httplocalratelimitpolicy + shortNames: [hlrlpolicy] + scope: Namespaced + versions: + - name: v1alpha1 + served: true + storage: true + subresources: + status: {} + schema: + openAPIV3Schema: + type: object + required: [spec] + properties: + spec: + type: object + required: [targetRef] + properties: + targetRef: + description: >- + TargetRef references a resource to which the rate limit + policy applies. Only Server is allowed. + type: object + required: [kind, name] + properties: + group: + description: >- + Group is the group of the referent. When empty, the + Kubernetes core API group is inferred. + maxLength: 253 + pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ + type: string + kind: + description: Kind is the kind of the referent. + maxLength: 63 + minLength: 1 + pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$ + type: string + name: + description: Name is the name of the referent. + maxLength: 253 + minLength: 1 + type: string + total: + description: >- + Overall rate-limit, which all traffic coming to this + target should abide. + If unset no overall limit is applied. + type: object + required: [requestsPerSecond] + properties: + requestsPerSecond: + format: int64 + type: integer + identity: + description: >- + Fairness for individual identities; each separate client, + grouped by identity, will have this rate-limit. The + requestsPerSecond value should be less than or equal to the + total requestsPerSecond (if set). + type: object + required: [requestsPerSecond] + properties: + requestsPerSecond: + format: int64 + type: integer + overrides: + description: >- + Overrides for traffic from a specific client. The + requestsPerSecond value should be less than or equal to the + total requestsPerSecond (if set). + type: array + items: + type: object + required: [requestsPerSecond, clientRefs] + properties: + requestsPerSecond: + format: int64 + type: integer + clientRefs: + type: array + items: + type: object + required: [kind, name] + properties: + group: + description: >- + Group is the group of the referent. When empty, the + Kubernetes core API group is inferred. + maxLength: 253 + pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ + type: string + kind: + description: Kind is the kind of the referent. + maxLength: 63 + minLength: 1 + pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$ + type: string + namespace: + description: >- + Namespace is the namespace of the referent. + When unspecified (or empty string), this refers to the + local namespace of the Policy. + maxLength: 63 + minLength: 1 + pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ + type: string + name: + description: Name is the name of the referent. + maxLength: 253 + minLength: 1 + type: string +--- # Source: linkerd-crds/templates/policy/httproute.yaml --- apiVersion: apiextensions.k8s.io/v1 diff --git a/cli/cmd/testdata/install_helm_crds_output_ha.golden b/cli/cmd/testdata/install_helm_crds_output_ha.golden index 5985ca2e2920f..0a9b7f3ba6a80 100644 --- a/cli/cmd/testdata/install_helm_crds_output_ha.golden +++ b/cli/cmd/testdata/install_helm_crds_output_ha.golden @@ -225,6 +225,135 @@ spec: - status - type --- +# Source: linkerd-crds/templates/policy/http-local-ratelimit-policy.yaml +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: httplocalratelimitpolicies.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: + kind: HTTPLocalRateLimitPolicy + plural: httplocalratelimitpolicies + singular: httplocalratelimitpolicy + shortNames: [hlrlpolicy] + scope: Namespaced + versions: + - name: v1alpha1 + served: true + storage: true + subresources: + status: {} + schema: + openAPIV3Schema: + type: object + required: [spec] + properties: + spec: + type: object + required: [targetRef] + properties: + targetRef: + description: >- + TargetRef references a resource to which the rate limit + policy applies. Only Server is allowed. + type: object + required: [kind, name] + properties: + group: + description: >- + Group is the group of the referent. When empty, the + Kubernetes core API group is inferred. + maxLength: 253 + pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ + type: string + kind: + description: Kind is the kind of the referent. + maxLength: 63 + minLength: 1 + pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$ + type: string + name: + description: Name is the name of the referent. + maxLength: 253 + minLength: 1 + type: string + total: + description: >- + Overall rate-limit, which all traffic coming to this + target should abide. + If unset no overall limit is applied. + type: object + required: [requestsPerSecond] + properties: + requestsPerSecond: + format: int64 + type: integer + identity: + description: >- + Fairness for individual identities; each separate client, + grouped by identity, will have this rate-limit. The + requestsPerSecond value should be less than or equal to the + total requestsPerSecond (if set). + type: object + required: [requestsPerSecond] + properties: + requestsPerSecond: + format: int64 + type: integer + overrides: + description: >- + Overrides for traffic from a specific client. The + requestsPerSecond value should be less than or equal to the + total requestsPerSecond (if set). + type: array + items: + type: object + required: [requestsPerSecond, clientRefs] + properties: + requestsPerSecond: + format: int64 + type: integer + clientRefs: + type: array + items: + type: object + required: [kind, name] + properties: + group: + description: >- + Group is the group of the referent. When empty, the + Kubernetes core API group is inferred. + maxLength: 253 + pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ + type: string + kind: + description: Kind is the kind of the referent. + maxLength: 63 + minLength: 1 + pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$ + type: string + namespace: + description: >- + Namespace is the namespace of the referent. + When unspecified (or empty string), this refers to the + local namespace of the Policy. + maxLength: 63 + minLength: 1 + pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ + type: string + name: + description: Name is the name of the referent. + maxLength: 253 + minLength: 1 + type: string +--- # Source: linkerd-crds/templates/policy/httproute.yaml --- apiVersion: apiextensions.k8s.io/v1 diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 0fb77334134d3..e3a56c8f98847 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -167,6 +167,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -210,6 +211,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1427,7 +1429,7 @@ spec: template: metadata: annotations: - checksum/config: 897be9c3f1c955b3a7624feb8435bd3eefd946a954634d04cf38d9c9813c5977 + checksum/config: 1c02562d84ed479248921e406146be0e36935c87b0d28a1c903c3b90a117cc5b linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index f8dd7d5357353..52ec6609acdc2 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -167,6 +167,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -210,6 +211,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1409,7 +1411,7 @@ spec: template: metadata: annotations: - checksum/config: 6ea3f771978787f69c67c9e5ab356c7216ca31ae0e42c39b0cc88beb6a72af25 + checksum/config: 412d4349fe71497326ed1946ce0d9c31985fd1db5c8d6a1be1d681987d0c6a33 linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 8757c76e3c512..549260c7382da 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1334,7 +1336,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 932add8be0c12..a4312038027c5 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -173,6 +173,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -216,6 +217,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1280,7 +1282,7 @@ spec: template: metadata: annotations: - checksum/config: 517aa09718582375a57ef993e2e182ee3303d0f257a8b967c2680181b076dc42 + checksum/config: 6b107c2b9d26d1c49f0d8912d5793a0c52438cdd5b3de537d13de0ec18da365e linkerd.io/created-by: CliVersion linkerd.io/proxy-version: ProxyVersion cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index a83653692e7db..d68ec93717a67 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1341,7 +1343,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 6b2b1e34a9806..0389a8dca945b 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -176,6 +176,7 @@ webhooks: apiVersions: ["*"] resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - networkauthentications - meshtlsauthentications @@ -219,6 +220,7 @@ rules: - policy.linkerd.io resources: - authorizationpolicies + - httplocalratelimitpolicies - httproutes - meshtlsauthentications - networkauthentications @@ -1341,7 +1343,7 @@ spec: template: metadata: annotations: - checksum/config: 742b40a4b565b2bb0fe1bb5c644952dfd4fe4c0d015fa618a9a895cd107b6627 + checksum/config: 726a0d9a61f222ca9efb64bc6ec38ad1d4beeab125c79f00b45a1d64be642875 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/proxy-version: install-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true"