forked from NationTech/harmony
		
	chore: Cleanup some logs and error message, also add a todo on bollard push failure to private registry
This commit is contained in:
		
							parent
							
								
									11481b16cd
								
							
						
					
					
						commit
						258cfa279e
					
				| @ -552,7 +552,7 @@ impl MultiTargetTopology for K8sAnywhereTopology { | |||||||
|         match self.config.harmony_profile.to_lowercase().as_str() { |         match self.config.harmony_profile.to_lowercase().as_str() { | ||||||
|             "staging" => DeploymentTarget::Staging, |             "staging" => DeploymentTarget::Staging, | ||||||
|             "production" => DeploymentTarget::Production, |             "production" => DeploymentTarget::Production, | ||||||
|             _ => todo!("HARMONY_PROFILE must be set when use_local_k3d is not set"), |             _ => todo!("HARMONY_PROFILE must be set when use_local_k3d is false"), | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -268,8 +268,6 @@ impl RustWebapp { | |||||||
| 
 | 
 | ||||||
|         let docker = Docker::connect_with_socket_defaults().unwrap(); |         let docker = Docker::connect_with_socket_defaults().unwrap(); | ||||||
| 
 | 
 | ||||||
|         // let push_options = PushImageOptionsBuilder::new().tag(tag);
 |  | ||||||
| 
 |  | ||||||
|         let mut push_image_stream = docker.push_image( |         let mut push_image_stream = docker.push_image( | ||||||
|             image_tag, |             image_tag, | ||||||
|             Some(PushImageOptionsBuilder::new().build()), |             Some(PushImageOptionsBuilder::new().build()), | ||||||
| @ -277,6 +275,8 @@ impl RustWebapp { | |||||||
|         ); |         ); | ||||||
| 
 | 
 | ||||||
|         while let Some(msg) = push_image_stream.next().await { |         while let Some(msg) = push_image_stream.next().await { | ||||||
|  |             // let msg = msg?;
 | ||||||
|  |             // TODO this fails silently, for some reason bollard cannot push to hub.nationtech.io
 | ||||||
|             debug!("Message: {msg:?}"); |             debug!("Message: {msg:?}"); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -221,7 +221,8 @@ impl RHOBAlertingInterpret { | |||||||
| 
 | 
 | ||||||
|         let output = Command::new("helm") |         let output = Command::new("helm") | ||||||
|             .args([ |             .args([ | ||||||
|                 "install", |                 "upgrade", | ||||||
|  |                 "--install", | ||||||
|                 "grafana-operator", |                 "grafana-operator", | ||||||
|                 "grafana-operator/grafana-operator", |                 "grafana-operator/grafana-operator", | ||||||
|                 "--namespace", |                 "--namespace", | ||||||
| @ -235,7 +236,7 @@ impl RHOBAlertingInterpret { | |||||||
| 
 | 
 | ||||||
|         if !output.status.success() { |         if !output.status.success() { | ||||||
|             return Err(InterpretError::new(format!( |             return Err(InterpretError::new(format!( | ||||||
|                 "helm install failed:\nstdout: {}\nstderr: {}", |                 "helm upgrade --install failed:\nstdout: {}\nstderr: {}", | ||||||
|                 String::from_utf8_lossy(&output.stdout), |                 String::from_utf8_lossy(&output.stdout), | ||||||
|                 String::from_utf8_lossy(&output.stderr) |                 String::from_utf8_lossy(&output.stderr) | ||||||
|             ))); |             ))); | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user