-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move healthz to metrics server & add tests
- Loading branch information
1 parent
54a70d5
commit 550ed09
Showing
8 changed files
with
93 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package caddy | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/caddyserver/ingress/pkg/store" | ||
| ) | ||
|
|
||
| func TestConvertToCaddyConfig(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| expectedConfigPath string | ||
| }{ | ||
| { | ||
| name: "default", | ||
| expectedConfigPath: "./test_data/default.json", | ||
| }, | ||
| } | ||
| for _, test := range tests { | ||
| t.Run(test.name, func(t *testing.T) { | ||
| cfg, err := Converter{}.ConvertToCaddyConfig(store.NewStore(store.Options{}, &store.PodInfo{})) | ||
| require.NoError(t, err) | ||
|
|
||
| cfgJson, err := json.Marshal(cfg) | ||
| require.NoError(t, err) | ||
|
|
||
| expectedCfg, err := os.ReadFile(test.expectedConfigPath) | ||
| require.NoError(t, err) | ||
|
|
||
| require.JSONEq(t, string(expectedCfg), string(cfgJson)) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "admin": {}, | ||
| "storage": { "module": "secret_store", "namespace": "", "leaseId": "" }, | ||
| "apps": { | ||
| "http": { | ||
| "servers": { | ||
| "ingress_server": { | ||
| "listen": [":80", ":443"], | ||
| "tls_connection_policies": [{}], | ||
| "automatic_https": {} | ||
| }, | ||
| "metrics_server": { | ||
| "listen": [":9765"], | ||
| "routes": [ | ||
| { | ||
| "match": [{ "path": ["/healthz"] }], | ||
| "handle": [{ "handler": "static_response", "status_code": 200 }] | ||
| } | ||
| ], | ||
| "automatic_https": { "disable": true } | ||
| } | ||
| } | ||
| }, | ||
| "tls": {} | ||
| }, | ||
| "logging": {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters