parent
							
								
									f400539b69
								
							
						
					
					
						commit
						db72d82f14
					
				|  | @ -16,7 +16,7 @@ const ( | ||||||
| var ( | var ( | ||||||
| 	// localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes.
 | 	// localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes.
 | ||||||
| 
 | 
 | ||||||
| 	// An instance of runtime.SchemeBuilder, global for this package
 | 	// SchemeBuilder : An instance of runtime.SchemeBuilder, global for this package
 | ||||||
| 	SchemeBuilder      runtime.SchemeBuilder | 	SchemeBuilder      runtime.SchemeBuilder | ||||||
| 	localSchemeBuilder = &SchemeBuilder | 	localSchemeBuilder = &SchemeBuilder | ||||||
| 	//AddToScheme is localSchemeBuilder.AddToScheme
 | 	//AddToScheme is localSchemeBuilder.AddToScheme
 | ||||||
|  |  | ||||||
|  | @ -91,7 +91,7 @@ func TestShmVolume(t *testing.T) { | ||||||
| 			podSpec: &v1.PodSpec{ | 			podSpec: &v1.PodSpec{ | ||||||
| 				Volumes: []v1.Volume{}, | 				Volumes: []v1.Volume{}, | ||||||
| 				Containers: []v1.Container{ | 				Containers: []v1.Container{ | ||||||
| 					v1.Container{ | 					{ | ||||||
| 						VolumeMounts: []v1.VolumeMount{}, | 						VolumeMounts: []v1.VolumeMount{}, | ||||||
| 					}, | 					}, | ||||||
| 				}, | 				}, | ||||||
|  | @ -101,11 +101,11 @@ func TestShmVolume(t *testing.T) { | ||||||
| 		{ | 		{ | ||||||
| 			subTest: "non empty PodSpec", | 			subTest: "non empty PodSpec", | ||||||
| 			podSpec: &v1.PodSpec{ | 			podSpec: &v1.PodSpec{ | ||||||
| 				Volumes: []v1.Volume{v1.Volume{}}, | 				Volumes: []v1.Volume{{}}, | ||||||
| 				Containers: []v1.Container{ | 				Containers: []v1.Container{ | ||||||
| 					v1.Container{ | 					{ | ||||||
| 						VolumeMounts: []v1.VolumeMount{ | 						VolumeMounts: []v1.VolumeMount{ | ||||||
| 							v1.VolumeMount{}, | 							{}, | ||||||
| 						}, | 						}, | ||||||
| 					}, | 					}, | ||||||
| 				}, | 				}, | ||||||
|  |  | ||||||
|  | @ -54,8 +54,8 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur | ||||||
| 	result.PodPriorityClassName = fromCRD.Kubernetes.PodPriorityClassName | 	result.PodPriorityClassName = fromCRD.Kubernetes.PodPriorityClassName | ||||||
| 	result.MasterPodMoveTimeout = fromCRD.Kubernetes.MasterPodMoveTimeout | 	result.MasterPodMoveTimeout = fromCRD.Kubernetes.MasterPodMoveTimeout | ||||||
| 
 | 
 | ||||||
| 	result.EnablePodAntiAffinity = fromCRD.Kubernetes.EnablePodAntiAffinity; | 	result.EnablePodAntiAffinity = fromCRD.Kubernetes.EnablePodAntiAffinity | ||||||
| 	result.PodAntiAffinityTopologyKey = fromCRD.Kubernetes.PodAntiAffinityTopologyKey; | 	result.PodAntiAffinityTopologyKey = fromCRD.Kubernetes.PodAntiAffinityTopologyKey | ||||||
| 
 | 
 | ||||||
| 	result.DefaultCPURequest = fromCRD.PostgresPodResources.DefaultCPURequest | 	result.DefaultCPURequest = fromCRD.PostgresPodResources.DefaultCPURequest | ||||||
| 	result.DefaultMemoryRequest = fromCRD.PostgresPodResources.DefaultMemoryRequest | 	result.DefaultMemoryRequest = fromCRD.PostgresPodResources.DefaultMemoryRequest | ||||||
|  |  | ||||||
|  | @ -130,7 +130,7 @@ func Coalesce(val, defaultVal string) string { | ||||||
| 	return val | 	return val | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // RequestIsSmallerThanLimit
 | // RequestIsSmallerThanLimit : ...
 | ||||||
| func RequestIsSmallerThanLimit(requestStr, limitStr string) (bool, error) { | func RequestIsSmallerThanLimit(requestStr, limitStr string) (bool, error) { | ||||||
| 
 | 
 | ||||||
| 	request, err := resource.ParseQuantity(requestStr) | 	request, err := resource.ParseQuantity(requestStr) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue