From 2fb2314f22df7814fdad85eac7a6ebd07e891fd7 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Tue, 20 Jul 2021 14:08:37 +0300 Subject: [PATCH] fix: Reuse ServiceDefaultDiffOpts for gateway service (#950) * fix: Reuse ServiceDefaultDiffOpts for gateway service Signed-off-by: Anatolii Bazko --- pkg/deploy/gateway/gateway.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkg/deploy/gateway/gateway.go b/pkg/deploy/gateway/gateway.go index 208701701..462309e38 100644 --- a/pkg/deploy/gateway/gateway.go +++ b/pkg/deploy/gateway/gateway.go @@ -23,7 +23,6 @@ import ( orgv1 "github.com/eclipse-che/che-operator/api/v1" "github.com/eclipse-che/che-operator/pkg/util" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -50,12 +49,8 @@ var ( serviceAccountDiffOpts = cmpopts.IgnoreFields(corev1.ServiceAccount{}, "TypeMeta", "ObjectMeta", "Secrets", "ImagePullSecrets") roleDiffOpts = cmpopts.IgnoreFields(rbac.Role{}, "TypeMeta", "ObjectMeta") roleBindingDiffOpts = cmpopts.IgnoreFields(rbac.RoleBinding{}, "TypeMeta", "ObjectMeta") - serviceDiffOpts = cmp.Options{ - cmpopts.IgnoreFields(corev1.Service{}, "TypeMeta", "ObjectMeta", "Status"), - cmpopts.IgnoreFields(corev1.ServiceSpec{}, "ClusterIP"), - } - configMapDiffOpts = cmpopts.IgnoreFields(corev1.ConfigMap{}, "TypeMeta", "ObjectMeta") - secretDiffOpts = cmpopts.IgnoreFields(corev1.Secret{}, "TypeMeta", "ObjectMeta") + configMapDiffOpts = cmpopts.IgnoreFields(corev1.ConfigMap{}, "TypeMeta", "ObjectMeta") + secretDiffOpts = cmpopts.IgnoreFields(corev1.Secret{}, "TypeMeta", "ObjectMeta") ) // SyncGatewayToCluster installs or deletes the gateway based on the custom resource configuration @@ -115,7 +110,7 @@ func syncAll(deployContext *deploy.DeployContext) error { } service := getGatewayServiceSpec(instance) - if _, err := deploy.Sync(deployContext, &service, serviceDiffOpts); err != nil { + if _, err := deploy.Sync(deployContext, &service, deploy.ServiceDefaultDiffOpts); err != nil { return err }