Skip to content

Commit

Permalink
add unit test for fall backup to default logic
Browse files Browse the repository at this point in the history
  • Loading branch information
simonycj committed Jul 18, 2024
1 parent 924da79 commit de7a686
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pkg/open-hydra/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
13 changes: 1 addition & 12 deletions pkg/open-hydra/k8s/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package k8s

import (
"context"
"encoding/json"
"fmt"
"log/slog"
"open-hydra/pkg/open-hydra/apis"
Expand Down Expand Up @@ -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
}
Expand Down
7 changes: 6 additions & 1 deletion pkg/open-hydra/open-hydra_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
})
})

Expand Down

0 comments on commit de7a686

Please sign in to comment.