feat: add response header

Signed-off-by: 逆流而上 <[email protected]>
goodrain · Feb 19, 2024 · 3736bbe · 3736bbe
1 parent d755a58
commit 3736bbe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/api/handler/gateway_action.go b/api/handler/gateway_action.go
@@ -1321,7 +1321,7 @@ func (g *GatewayAction) RuleConfig(req *apimodel.RuleConfigReq) error {
 			item.Value = "empty"
 		}
 		// filter same key
-		setheaders["resp-header-"+item.Key] = item.Value
+		responseHeaders["resp-header-"+item.Key] = item.Value
 	}
 	for k, v := range responseHeaders {
 		configs = append(configs, &model.GwRuleConfig{

diff --git a/gateway/annotations/proxy/proxy.go b/gateway/annotations/proxy/proxy.go
@@ -288,6 +288,7 @@ func (a proxy) Parse(meta *metav1.ObjectMeta) (interface{}, error) {
 	}
 
 	// response header
+	config.ResponseHeaders = make(map[string]string)
 	responseHeaders, err := parser.GetStringAnnotationWithPrefix("resp-header-", meta)
 	if err != nil && !strings.Contains(err.Error(), "ingress rule without annotations") {
 		logrus.Debugf("get header annotation failure %s", err.Error())

diff --git a/gateway/controller/openresty/service.go b/gateway/controller/openresty/service.go
@@ -55,7 +55,7 @@ type OrService struct {
 	configManage  *template.NginxConfigFileTemplete
 }
 
-//CreateOpenrestyService create openresty service
+// CreateOpenrestyService create openresty service
 func CreateOpenrestyService(config *option.Config, isShuttingDown *bool) *OrService {
 	gws := &OrService{
 		IsShuttingDown: isShuttingDown,
@@ -152,10 +152,10 @@ func (o *OrService) PersistConfig(conf *v1.Config) error {
 	o.configManage.WriteServer(*o.ocfg, "stream", "", l4srv...)
 
 	// reload nginx
-	if err := nginxcmd.Reload(); err != nil {
-		logrus.Errorf("Nginx reloads falure %s", err.Error())
-		return err
-	}
+	//if err := nginxcmd.Reload(); err != nil {
+	//	logrus.Errorf("Nginx reloads falure %s", err.Error())
+	//	return err
+	//}
 	logrus.Debug("Nginx reloads successfully.")
 	return nil
 }

diff --git a/hack/contrib/docker/gateway/nginxtmp/servers.tmpl b/hack/contrib/docker/gateway/nginxtmp/servers.tmpl
@@ -65,7 +65,7 @@ server {
         proxy_set_header    {{$k}}    {{$v}};
         {{ end }}
 
-        # set response headers
+        # custom set response headers
         {{ range $k1, $v1 := $loc.Proxy.ResponseHeaders }}
         add_header    {{$k1}}    {{$v1}};
         {{ end }}