Surpport snippet for server section by the annotation of the ingess #1398

decker502 · 2017-09-21T02:46:04Z

eg:

apiVersion: extensions/v1beta1
kind: Ingress
metadata:
annotations:
ingress.kubernetes.io/server-snippet: |
set $agentflag 0;

if ($http_user_agent ~* "(Mobile)" )
{
set $agentflag 1;
}

  if ( $agentflag = 1 ) {
    return 301 https://m.example.com;
  }

k8s-reviewable · 2017-09-21T02:46:24Z

This change is

coveralls · 2017-09-21T07:13:35Z

Coverage decreased (-0.04%) to 43.673% when pulling 15c6a11 on decker502:server-snippet into 37bd14d on kubernetes:master.

diazjf · 2017-09-27T04:00:21Z

core/pkg/ingress/types.go

@@ -236,6 +236,9 @@ type Server struct {
 	// CertificateAuth indicates the this server requires mutual authentication
 	// +optional
 	CertificateAuth authtls.AuthSSLConfig `json:"certificateAuth"`
+
+	// ServerSnippet returns the snippet of server


diazjf · 2017-09-27T04:02:28Z

core/pkg/ingress/controller/controller.go

@@ -1065,6 +1065,28 @@ func (ic *GenericController) createServers(data []interface{},
 			servers[host].Alias = ""
 		}
 	}
+
+	// configure server snippet
+	for _, ingIf := range data {


This loop is already being called in line 982, why not add this logic in there to avoid looping again?

diazjf · 2017-09-27T04:04:42Z

core/pkg/ingress/controller/controller.go

+				host = defServerName
+			}
+
+			srvsnippet := ic.annotations.ServerSnippet(ing)


You can add this before the loop to avoid calling each time.

diazjf · 2017-09-27T04:05:30Z

core/pkg/ingress/controller/controller.go

+
+			if servers[host].ServerSnippet == "" && srvsnippet != "" {
+				servers[host].ServerSnippet = srvsnippet
+			}


Add a Warning, notifying the user that it has already been configured.

diazjf · 2017-09-27T04:06:05Z

core/pkg/ingress/annotations/serversnippet/main.go

+type serverSnippet struct {
+}
+
+// NewParser creates a new CORS annotation parser


coveralls · 2017-09-27T07:30:07Z

Coverage increased (+0.04%) to 43.752% when pulling 5dfee7b on decker502:server-snippet into 37bd14d on kubernetes:master.

aledbf · 2017-09-27T17:43:59Z

/lgtm

aledbf · 2017-09-27T17:44:04Z

@decker502 thanks!

Surpport snippet for server section by the annotation of the ingess

407d853

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 21, 2017

fix test

15c6a11

diazjf suggested changes Sep 27, 2017

View reviewed changes

changed by suggest

5dfee7b

k8s-ci-robot assigned aledbf Sep 27, 2017

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 27, 2017

aledbf merged commit 75cccbb into kubernetes:master Sep 27, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Surpport snippet for server section by the annotation of the ingess #1398

Surpport snippet for server section by the annotation of the ingess #1398

decker502 commented Sep 21, 2017

k8s-reviewable commented Sep 21, 2017

coveralls commented Sep 21, 2017

diazjf Sep 27, 2017

diazjf Sep 27, 2017

diazjf Sep 27, 2017

diazjf Sep 27, 2017

diazjf Sep 27, 2017

coveralls commented Sep 27, 2017

aledbf commented Sep 27, 2017

aledbf commented Sep 27, 2017

Surpport snippet for server section by the annotation of the ingess #1398

Surpport snippet for server section by the annotation of the ingess #1398

Conversation

decker502 commented Sep 21, 2017

k8s-reviewable commented Sep 21, 2017

coveralls commented Sep 21, 2017

diazjf Sep 27, 2017

Choose a reason for hiding this comment

diazjf Sep 27, 2017

Choose a reason for hiding this comment

diazjf Sep 27, 2017

Choose a reason for hiding this comment

diazjf Sep 27, 2017

Choose a reason for hiding this comment

diazjf Sep 27, 2017

Choose a reason for hiding this comment

coveralls commented Sep 27, 2017

aledbf commented Sep 27, 2017

aledbf commented Sep 27, 2017