diff --git a/src/ocp_postprocess/proxy_rename/etcd_rename.rs b/src/ocp_postprocess/proxy_rename/etcd_rename.rs index 04d058a1..48da267f 100644 --- a/src/ocp_postprocess/proxy_rename/etcd_rename.rs +++ b/src/ocp_postprocess/proxy_rename/etcd_rename.rs @@ -145,15 +145,15 @@ pub(crate) async fn fix_controllerconfigs(etcd_client: &InMemoryK8sEtcd, proxy: pub(crate) async fn fix_containers(etcd_client: &InMemoryK8sEtcd, proxy: &Proxy) -> Result<()> { join_all( etcd_client - .list_keys("controllerrevisions/") + .list_keys("deployments/") .await? .into_iter() - // .chain(etcd_client.list_keys("statefulsets/").await?.into_iter()) - // .chain(etcd_client.list_keys("daemonsets/").await?.into_iter()) - // .chain(etcd_client.list_keys("jobs/").await?.into_iter()) - // .chain(etcd_client.list_keys("cronjobs/").await?.into_iter()) - // .chain(etcd_client.list_keys("monitoring.coreos.com/alertmanagers/").await?.into_iter()) - // .chain(etcd_client.list_keys("monitoring.coreos.com/prometheuses/").await?.into_iter()) + .chain(etcd_client.list_keys("statefulsets/").await?.into_iter()) + .chain(etcd_client.list_keys("daemonsets/").await?.into_iter()) + .chain(etcd_client.list_keys("jobs/").await?.into_iter()) + .chain(etcd_client.list_keys("cronjobs/").await?.into_iter()) + .chain(etcd_client.list_keys("monitoring.coreos.com/alertmanagers/").await?.into_iter()) + .chain(etcd_client.list_keys("monitoring.coreos.com/prometheuses/").await?.into_iter()) .chain(etcd_client.list_keys("controllerrevisions/").await?.into_iter()) .map(|key| async move { let etcd_result = etcd_client @@ -194,11 +194,15 @@ pub(crate) async fn fix_containers(etcd_client: &InMemoryK8sEtcd, proxy: &Proxy) // array of numbers to a string, then parse it as JSON, then fix the containers // in the JSON, then convert it back to a string, then convert it back to a JSON // array of numbers, then put it back in the ControllerRevision. - let workload_as_obj = workload.as_object_mut().context("workload not an object")?; + let workload_data = workload + .pointer_mut("/data") + .context("no /data")? + .as_object_mut() + .context("data not an object")?; let data_string = &String::from_utf8( - workload_as_obj - .get("data") + workload_data + .get("raw") .context("no data")? .as_array() .context("data not an array")? @@ -216,8 +220,8 @@ pub(crate) async fn fix_containers(etcd_client: &InMemoryK8sEtcd, proxy: &Proxy) super::utils::fix_containers(&mut data_json, proxy, prefix).context("fixing containers")?; - workload_as_obj.insert( - "data".to_string(), + workload_data.insert( + "raw".to_string(), serde_json::to_string(&data_json) .context("serializing data")? .bytes()