Skip to content

Force apply changes on patches for unresolvable conflicts #141

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Force apply changes on patches for unresolvable conflicts #141

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 src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ async fn configure_hosts(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Res
let api = Api::<DaemonSet>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
api.patch(
&config.name_any(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(ds),
)
.await?;
Expand All @@ -900,7 +900,7 @@ async fn configure_hosts(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Res
let api = Api::<Deployment>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
api.patch(
&config.name_any(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(deployment),
)
.await?;
Expand Down Expand Up @@ -942,7 +942,7 @@ async fn configure_service(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> R
let api = Api::<Service>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
api.patch(
&config.name_any(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(svc),
)
.await?;
Expand All @@ -963,7 +963,7 @@ async fn configure_auth(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Resu
let api = Api::<ServiceAccount>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
api.patch(
&config.name_any(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(svc_account),
)
.await?;
Expand Down Expand Up @@ -993,7 +993,7 @@ async fn configure_auth(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Resu
let api = Api::<Role>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
api.patch(
&config.name_any(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(role),
)
.await?;
Expand All @@ -1020,7 +1020,7 @@ async fn configure_auth(config: &WasmCloudHostConfig, ctx: Arc<Context>) -> Resu
let api = Api::<RoleBinding>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
api.patch(
&config.name_any(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(role_binding),
)
.await?;
Expand Down Expand Up @@ -1066,7 +1066,7 @@ leafnodes {
let api = Api::<ConfigMap>::namespaced(ctx.client.clone(), &config.namespace().unwrap());
api.patch(
&config.name_any(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(cm),
)
.await?;
Expand Down
4 changes: 2 additions & 2 deletions src/services.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ pub async fn create_or_update_service(
let svc = api
.patch(
params.name.as_str(),
&PatchParams::apply(SERVICE_FINALIZER),
&PatchParams::apply(SERVICE_FINALIZER).force(),
&Patch::Apply(svc),
)
.await
Expand Down Expand Up @@ -536,7 +536,7 @@ pub async fn create_or_update_service(
endpoints
.patch(
params.name.as_str(),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER),
&PatchParams::apply(CLUSTER_CONFIG_FINALIZER).force(),
&Patch::Apply(endpoint_slice),
)
.await
Expand Down