Add ServerStatusZones support in vs/vsr

nginx · Sep 16, 2019 · eff8c94 · eff8c94
1 parent eb2a6e1
commit eff8c94
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/internal/configs/version2/config.go b/internal/configs/version2/config.go
@@ -31,6 +31,7 @@ type UpstreamServer struct {
 // Server defines a server.
 type Server struct {
 	ServerName                            string
+	StatusZone                            string
 	ProxyProtocol                         bool
 	SSL                                   *SSL
 	RedirectToHTTPSBasedOnXForwarderProto bool

diff --git a/internal/configs/version2/nginx-plus.virtualserver.tmpl b/internal/configs/version2/nginx-plus.virtualserver.tmpl
@@ -41,6 +41,7 @@ server {
     listen 80{{ if $s.ProxyProtocol }} proxy_protocol{{ end }};
 
     server_name {{ $s.ServerName }};
+    status_zone {{ $s.StatusZone }};
 
     {{ with $ssl := $s.SSL }}
     listen 443 ssl{{ if $ssl.HTTP2 }} http2{{ end }}{{ if $s.ProxyProtocol }} proxy_protocol{{ end }};

diff --git a/internal/configs/version2/templates_test.go b/internal/configs/version2/templates_test.go
@@ -95,6 +95,7 @@ var virtualServerCfg = VirtualServerConfig{
 	},
 	Server: Server{
 		ServerName:    "example.com",
+		StatusZone:    "example.com",
 		ProxyProtocol: true,
 		SSL: &SSL{
 			HTTP2:           true,

diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go
@@ -326,6 +326,7 @@ func generateVirtualServerConfig(virtualServerEx *VirtualServerEx, tlsPemFileNam
 		StatusMatches: statusMatches,
 		Server: version2.Server{
 			ServerName:                            virtualServerEx.VirtualServer.Spec.Host,
+			StatusZone:                            virtualServerEx.VirtualServer.Spec.Host,
 			ProxyProtocol:                         baseCfgParams.ProxyProtocol,
 			SSL:                                   ssl,
 			RedirectToHTTPSBasedOnXForwarderProto: baseCfgParams.RedirectToHTTPS,

diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go
@@ -255,6 +255,7 @@ func TestGenerateVirtualServerConfig(t *testing.T) {
 		},
 		Server: version2.Server{
 			ServerName:                            "cafe.example.com",
+			StatusZone:                            "cafe.example.com",
 			ProxyProtocol:                         true,
 			RedirectToHTTPSBasedOnXForwarderProto: true,
 			ServerTokens:                          "off",
@@ -456,6 +457,7 @@ func TestGenerateVirtualServerConfigForVirtualServerWithSplits(t *testing.T) {
 		},
 		Server: version2.Server{
 			ServerName: "cafe.example.com",
+			StatusZone: "cafe.example.com",
 			InternalRedirectLocations: []version2.InternalRedirectLocation{
 				{
 					Path:        "/tea",
@@ -713,6 +715,7 @@ func TestGenerateVirtualServerConfigForVirtualServerWithRules(t *testing.T) {
 		},
 		Server: version2.Server{
 			ServerName: "cafe.example.com",
+			StatusZone: "cafe.example.com",
 			InternalRedirectLocations: []version2.InternalRedirectLocation{
 				{
 					Path:        "/tea",