From de7a6868b38003d4efa576050f43b819cc93bbd5 Mon Sep 17 00:00:00 2001 From: yangchenjun Date: Thu, 18 Jul 2024 09:33:27 +0800 Subject: [PATCH] add unit test for fall backup to default logic --- pkg/open-hydra/handler.go | 2 +- pkg/open-hydra/k8s/k8s.go | 13 +------------ pkg/open-hydra/open-hydra_test.go | 7 ++++++- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkg/open-hydra/handler.go b/pkg/open-hydra/handler.go index a7a82d3..2145f75 100644 --- a/pkg/open-hydra/handler.go +++ b/pkg/open-hydra/handler.go @@ -150,7 +150,7 @@ func (builder *OpenHydraRouteBuilder) GetServerConfigFromConfigMap() (*config.Op return nil, fmt.Errorf("config map data is empty") } - serverConfig := &config.OpenHydraServerConfig{} + serverConfig := config.DefaultConfig() err = yaml.Unmarshal([]byte(configMap.Data["config.yaml"]), serverConfig) if err != nil { diff --git a/pkg/open-hydra/k8s/k8s.go b/pkg/open-hydra/k8s/k8s.go index b87965d..e602092 100644 --- a/pkg/open-hydra/k8s/k8s.go +++ b/pkg/open-hydra/k8s/k8s.go @@ -2,7 +2,6 @@ package k8s import ( "context" - "encoding/json" "fmt" "log/slog" "open-hydra/pkg/open-hydra/apis" @@ -181,17 +180,7 @@ func (help *DefaultHelper) CreateDeployment(deployParameter *DeploymentParameter deployment.Spec.Template.Spec.Affinity = deployParameter.Affinity - debugDeploy, err := json.Marshal(deployment) - if err != nil { - slog.Error("failed to marshal deployment", "error", err) - return err - } - - fmt.Println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`") - slog.Info("deployment", "deployment", string(debugDeploy)) - fmt.Println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`") - - _, err = deployParameter.Client.AppsV1().Deployments(deployParameter.Namespace).Create(context.TODO(), deployment, metaV1.CreateOptions{}) + _, err := deployParameter.Client.AppsV1().Deployments(deployParameter.Namespace).Create(context.TODO(), deployment, metaV1.CreateOptions{}) if err != nil { return err } diff --git a/pkg/open-hydra/open-hydra_test.go b/pkg/open-hydra/open-hydra_test.go index fa57e93..2e314ce 100644 --- a/pkg/open-hydra/open-hydra_test.go +++ b/pkg/open-hydra/open-hydra_test.go @@ -124,9 +124,14 @@ var _ = Describe("open-hydra-server handler test", func() { Describe("GetServerConfigFromConfigMap test", func() { It("get server config from config map should be expected", func() { + fakeK8sHelper.ServerConfig.PodAllocatableLimit = 0 config, err := builder.GetServerConfigFromConfigMap() Expect(err).To(BeNil()) - Expect(config).To(Equal(fakeK8sHelper.ServerConfig)) + Expect(int(config.PodAllocatableLimit)).To(Equal(-1)) + fakeK8sHelper.ServerConfig.PodAllocatableLimit = 100 + config, err = builder.GetServerConfigFromConfigMap() + Expect(err).To(BeNil()) + Expect(int(config.PodAllocatableLimit)).To(Equal(100)) }) })