Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(policy): simplify status controller type matching #13395

Merged
merged 1 commit into from
Nov 25, 2024
Merged

chore(policy): simplify status controller type matching #13395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions policy-controller/k8s/status/src/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,19 +268,19 @@ impl Controller {
// process through the updates queue but not actually patch
// any resources.
if is_leader {
if id.gkn.group == linkerd_k8s_api::HttpRoute::group(&()) && id.gkn.kind == linkerd_k8s_api::HttpRoute::kind(&()){
if id.is_a::<linkerd_k8s_api::HttpRoute>() {
self.patch::<linkerd_k8s_api::HttpRoute>(&id.gkn.name, &id.namespace, patch).await;
} else if id.gkn.group == k8s_gateway_api::HttpRoute::group(&()) && id.gkn.kind == k8s_gateway_api::HttpRoute::kind(&()) {
} else if id.is_a::<k8s_gateway_api::HttpRoute>() {
self.patch::<k8s_gateway_api::HttpRoute>(&id.gkn.name, &id.namespace, patch).await;
} else if id.gkn.group == k8s_gateway_api::GrpcRoute::group(&()) && id.gkn.kind == k8s_gateway_api::GrpcRoute::kind(&()) {
} else if id.is_a::<k8s_gateway_api::GrpcRoute>() {
self.patch::<k8s_gateway_api::GrpcRoute>(&id.gkn.name, &id.namespace, patch).await;
} else if id.gkn.group == k8s_gateway_api::TcpRoute::group(&()) && id.gkn.kind == k8s_gateway_api::TcpRoute::kind(&()) {
} else if id.is_a::<k8s_gateway_api::TcpRoute>() {
self.patch::<k8s_gateway_api::TcpRoute>(&id.gkn.name, &id.namespace, patch).await;
} else if id.gkn.group == k8s_gateway_api::TlsRoute::group(&()) && id.gkn.kind == k8s_gateway_api::TlsRoute::kind(&()) {
} else if id.is_a::<k8s_gateway_api::TlsRoute>() {
self.patch::<k8s_gateway_api::TlsRoute>(&id.gkn.name, &id.namespace, patch).await;
} else if id.gkn.group == linkerd_k8s_api::HttpLocalRateLimitPolicy::group(&()) && id.gkn.kind == linkerd_k8s_api::HttpLocalRateLimitPolicy::kind(&()) {
} else if id.is_a::<linkerd_k8s_api::HttpLocalRateLimitPolicy>() {
self.patch::<linkerd_k8s_api::HttpLocalRateLimitPolicy>(&id.gkn.name, &id.namespace, patch).await;
} else if id.gkn.group == linkerd_k8s_api::EgressNetwork::group(&()) && id.gkn.kind == linkerd_k8s_api::EgressNetwork::kind(&()) {
} else if id.is_a::<linkerd_k8s_api::EgressNetwork>() {
self.patch::<linkerd_k8s_api::EgressNetwork>(&id.gkn.name, &id.namespace, patch).await;
}
} else {
Expand Down
7 changes: 7 additions & 0 deletions policy-controller/k8s/status/src/resource_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,11 @@ impl NamespaceGroupKindName {
}
}
}

pub fn is_a<K>(&self) -> bool
where
K: Resource<DynamicType = ()>,
{
self.gkn.group == K::group(&()) && self.gkn.kind == K::kind(&())
}
}
Loading