linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow `Server` CRD to have empty `PodSelector` (#7925) 

Fixes #7904

Allow the `Server` CRD to have the `PodSelector` entry be an empty object, by removing the `omitempty` tag from its go type definition and the `oneof` section in the CRD. No update to the CRD version is required, as this is BC change -- The CRD overriding was tested fine.

Also added some unit tests to confirm podSelector conditions are ANDed, and some minor refactorings in the `Selector` constructors.

Co-authored-by: Oliver Gould <ver@buoyant.io>
This commit is contained in:
Alejandro Pedraza 2022-02-23 08:45:34 -05:00 committed by GitHub
parent 8fd1a291e4
commit a268ff11c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 87 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/linkerd-crds/templates/policy/server.yaml
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_helm_crds_output.golden generated vendored
View File

@ -97,9 +97,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_helm_crds_output_ha.golden generated vendored
View File

@ -97,9 +97,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_no_init_container.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_output.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

6
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -95,9 +95,9 @@ spec:
type: object type: object
description: >- description: >-
Selects pods in the same namespace. Selects pods in the same namespace.
oneOf:
- required: [matchExpressions] The result of matchLabels and matchExpressions are ANDed.
- required: [matchLabels] Selects all if empty.
properties: properties:
matchLabels: matchLabels:
type: object type: object

2
controller/gen/apis/server/v1beta1/types.go
View File

@ -29,7 +29,7 @@ type Server struct {
// ServerSpec specifies a Server resource. // ServerSpec specifies a Server resource.
type ServerSpec struct { type ServerSpec struct {
PodSelector *metav1.LabelSelector `json:"podSelector,omitempty"` PodSelector *metav1.LabelSelector `json:"podSelector"`
Port intstr.IntOrString `json:"port,omitempty"` Port intstr.IntOrString `json:"port,omitempty"`
ProxyProtocol string `json:"proxyProtocol,omitempty"` ProxyProtocol string `json:"proxyProtocol,omitempty"`
} }

41
policy-controller/k8s/api/src/labels.rs
View File

@ -27,7 +27,8 @@ pub enum Operator {
DoesNotExist, DoesNotExist,
} }
/// Selects a set of pods that expose a server. /// Selects a set of pods that expose a server. The result of `match_labels` and
/// `match_expressions` are ANDed.
#[derive(Clone, Debug, Eq, PartialEq, Default, Deserialize, Serialize, JsonSchema)] #[derive(Clone, Debug, Eq, PartialEq, Default, Deserialize, Serialize, JsonSchema)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Selector { pub struct Selector {
@ -38,14 +39,22 @@ pub struct Selector {
// === Selector === // === Selector ===
impl Selector { impl Selector {
pub fn from_expressions(exprs: Expressions) -> Self { #[cfg(test)]
fn new(labels: Map, exprs: Expressions) -> Self {
Self {
match_labels: Some(labels),
match_expressions: Some(exprs),
}
}
fn from_expressions(exprs: Expressions) -> Self {
Self { Self {
match_labels: None, match_labels: None,
match_expressions: Some(exprs), match_expressions: Some(exprs),
} }
} }
pub fn from_map(map: Map) -> Self { fn from_map(map: Map) -> Self {
Self { Self {
match_labels: Some(map), match_labels: Some(map),
match_expressions: None, match_expressions: None,
@ -201,6 +210,32 @@ mod tests {
true, true,
"expression match", "expression match",
), ),
(
Selector::new(
Map::from([("foo".to_string(), "bar".to_string())]),
vec![Expression {
key: "bah".into(),
operator: Operator::In,
values: Some(Some("bar".to_string()).into_iter().collect()),
}],
),
Labels::from_iter(vec![("foo", "bar"), ("bah", "baz")]),
false,
"matches labels but not expressions",
),
(
Selector::new(
Map::from([("foo".to_string(), "bar".to_string())]),
vec![Expression {
key: "bah".into(),
operator: Operator::In,
values: Some(Some("bar".to_string()).into_iter().collect()),
}],
),
Labels::from_iter(vec![("foo", "bar"), ("bah", "bar")]),
true,
"matches both labels and expressions",
),
] { ] {
assert_eq!(selector.matches(labels), *matches, "{}", msg); assert_eq!(selector.matches(labels), *matches, "{}", msg);
} }