Skip to content

Commit b3b5e0a

Browse files
committed
remove leftover fields && duplicate comparison
Signed-off-by: Atif Ali <[email protected]>
1 parent 3470b8b commit b3b5e0a

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

controllers/consoleplugin.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@ func getPluginPodSpec() corev1.PodSpec {
5555
podSpec := corev1.PodSpec{
5656
Containers: []corev1.Container{
5757
{
58-
Env: util.ProxyEnvVars(),
59-
Name: gitopsPluginName,
60-
Image: consolePluginImage,
61-
ImagePullPolicy: corev1.PullAlways,
62-
TerminationMessagePath: corev1.TerminationMessagePathDefault,
63-
TerminationMessagePolicy: corev1.TerminationMessageReadFile,
58+
Env: util.ProxyEnvVars(),
59+
Name: gitopsPluginName,
60+
Image: consolePluginImage,
61+
ImagePullPolicy: corev1.PullAlways,
6462
Ports: []corev1.ContainerPort{
6563
{
6664
Name: "http",

controllers/gitopsservice_controller.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,15 +670,11 @@ func (r *ReconcileGitopsService) reconcileBackend(gitopsserviceNamespacedName ty
670670
found.Spec.Template.Spec.Containers[0].Env = deploymentObj.Spec.Template.Spec.Containers[0].Env
671671
changed = true
672672
}
673-
// Use semantic equality to handle Kubernetes defaults properly
674-
if !equality.Semantic.DeepEqual(found.Spec.Template.Spec.Containers[0].Resources, deploymentObj.Spec.Template.Spec.Containers[0].Resources) {
675-
found.Spec.Template.Spec.Containers[0].Resources = deploymentObj.Spec.Template.Spec.Containers[0].Resources
676-
changed = true
677-
}
678673
if !equality.Semantic.DeepEqual(found.Spec.Template.Spec.Containers[0].Args, deploymentObj.Spec.Template.Spec.Containers[0].Args) {
679674
found.Spec.Template.Spec.Containers[0].Args = deploymentObj.Spec.Template.Spec.Containers[0].Args
680675
changed = true
681676
}
677+
// Use semantic equality to handle Kubernetes defaults properly
682678
if !equality.Semantic.DeepEqual(found.Spec.Template.Spec.Containers[0].Resources, deploymentObj.Spec.Template.Spec.Containers[0].Resources) {
683679
found.Spec.Template.Spec.Containers[0].Resources = deploymentObj.Spec.Template.Spec.Containers[0].Resources
684680
changed = true

0 commit comments

Comments
 (0)