feat: support redering custom DNS resolvers on Nginx conf

tsuru · Jul 10, 2023 · e4eab84 · e4eab84
1 parent 435cf11
commit e4eab84
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 0 deletions.
diff --git a/api/v1alpha1/rpaasplan_types.go b/api/v1alpha1/rpaasplan_types.go
@@ -81,6 +81,9 @@ type NginxConfig struct {
 	VTSEnabled                *bool  `json:"vtsEnabled,omitempty"`
 	VTSStatusHistogramBuckets string `json:"vtsStatusHistogramBuckets,omitempty"`
 
+	ResolverAddresses []string `json:"resolverAddresses,omitempty"`
+	ResolverTTL       string   `json:"resolverTTL,omitempty"`
+
 	SyslogEnabled       *bool  `json:"syslogEnabled,omitempty"`
 	SyslogServerAddress string `json:"syslogServerAddress,omitempty"`
 	SyslogFacility      string `json:"syslogFacility,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/extensions.tsuru.io_rpaasflavors.yaml b/config/crd/bases/extensions.tsuru.io_rpaasflavors.yaml
@@ -494,6 +494,12 @@ spec:
                             type: integer
                           mapHashMaxSize:
                             type: integer
+                          resolverAddresses:
+                            items:
+                              type: string
+                            type: array
+                          resolverTTL:
+                            type: string
                           syslogEnabled:
                             type: boolean
                           syslogFacility:

diff --git a/config/crd/bases/extensions.tsuru.io_rpaasinstances.yaml b/config/crd/bases/extensions.tsuru.io_rpaasinstances.yaml
@@ -475,6 +475,12 @@ spec:
                         type: integer
                       mapHashMaxSize:
                         type: integer
+                      resolverAddresses:
+                        items:
+                          type: string
+                        type: array
+                      resolverTTL:
+                        type: string
                       syslogEnabled:
                         type: boolean
                       syslogFacility:

diff --git a/config/crd/bases/extensions.tsuru.io_rpaasplans.yaml b/config/crd/bases/extensions.tsuru.io_rpaasplans.yaml
@@ -82,6 +82,12 @@ spec:
                     type: integer
                   mapHashMaxSize:
                     type: integer
+                  resolverAddresses:
+                    items:
+                      type: string
+                    type: array
+                  resolverTTL:
+                    type: string
                   syslogEnabled:
                     type: boolean
                   syslogFacility:

diff --git a/internal/pkg/rpaas/nginx/configuration_render.go b/internal/pkg/rpaas/nginx/configuration_render.go
@@ -308,6 +308,10 @@ http {
     include       mime.types;
     default_type  application/octet-stream;
 
+    {{- if $config.ResolverAddresses }}
+    resolver {{ join " " $config.ResolverAddresses }}{{ with $config.ResolverTTL }} ttl={{ . }}{{ end }};
+    {{- end }}
+
     {{- $logFormatName := default "rpaasv2" $config.LogFormatName }}
 
     {{- if $config.LogFormat }}

diff --git a/internal/pkg/rpaas/nginx/configuration_render_test.go b/internal/pkg/rpaas/nginx/configuration_render_test.go
@@ -570,6 +570,31 @@ func TestRpaasConfigurationRenderer_Render(t *testing.T) {
 `, result)
 			},
 		},
+		{
+			name: "with custom resolver",
+			data: ConfigurationData{
+				Config: &v1alpha1.NginxConfig{
+					ResolverAddresses: []string{"kube-dns.kube-system.svc.cluster.local.", "169.196.255.254:3553"},
+				},
+				Instance: &v1alpha1.RpaasInstance{},
+			},
+			assertion: func(t *testing.T, result string) {
+				assert.Regexp(t, `\s+resolver kube-dns\.kube-system\.svc\.cluster\.local\. 169\.196\.255\.254:3553;\n`, result)
+			},
+		},
+		{
+			name: "with custom resolvers and TTL",
+			data: ConfigurationData{
+				Config: &v1alpha1.NginxConfig{
+					ResolverAddresses: []string{"kube-dns.kube-system.svc.cluster.local.", "169.196.255.254:3553"},
+					ResolverTTL:       "30m",
+				},
+				Instance: &v1alpha1.RpaasInstance{},
+			},
+			assertion: func(t *testing.T, result string) {
+				assert.Regexp(t, `\s+resolver kube-dns\.kube-system\.svc\.cluster\.local\. 169\.196\.255\.254:3553 ttl=30m;\n`, result)
+			},
+		},
 	}
 
 	for _, tt := range tests {