Add option to set external policy to local for openstack services

External traffic policy "local" would be preffered when openstack service is accessed from external via node port. This option has an effect only when service node port is enabled. Change-Id: Ic68cfc59dc39dc842d4790deffa70efe433dd7a6
2017-11-02 14:37:09 +09:00 · 2017-11-02 14:37:09 +09:00 · 0808cf5198
commit 0808cf5198
parent 5df00a4d78
22 changed files with 55 additions and 6 deletions
--- a/barbican/templates/service-api.yaml
+++ b/barbican/templates/service-api.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "barbican" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.api.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.api.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@ -134,6 +134,7 @@ network:
  api:
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 39486
--- a/cinder/templates/service-api.yaml
+++ b/cinder/templates/service-api.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "cinder" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.api.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.api.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@ -195,6 +195,7 @@ network:
  api:
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30877
--- a/glance/templates/service-api.yaml
+++ b/glance/templates/service-api.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "glance" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.api.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.api.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/glance/templates/service-registry.yaml
+++ b/glance/templates/service-registry.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.registry.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.registry.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/glance/values.yaml
+++ b/glance/values.yaml
@ -275,12 +275,14 @@ network:
    ingress:
      public: true
      proxy_body_size: 1024M
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30092
  registry:
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30091
--- a/gnocchi/templates/service-api.yaml
+++ b/gnocchi/templates/service-api.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "gnocchi" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.api.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.api.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@ -27,6 +27,7 @@ network:
  api:
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 8041
--- a/heat/templates/service-api.yaml
+++ b/heat/templates/service-api.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "heat" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.api.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.api.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/heat/values.yaml
+++ b/heat/values.yaml
@ -221,6 +221,7 @@ network:
  api:
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30004
--- a/horizon/templates/service.yaml
+++ b/horizon/templates/service.yaml
@ -23,9 +23,9 @@ metadata:
  name: {{ tuple "dashboard" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
 spec:
  ports:
-    {{ if .Values.network.enable_node_port }}
+    {{ if .Values.network.node_port.enabled }}
    - name: http
-      nodePort: {{ .Values.network.node_port }}
+      nodePort: {{ .Values.network.node_port.port }}
      port: {{ .Values.network.port }}
      protocol: TCP
      targetPort: {{ .Values.network.port }}
@ -37,7 +37,10 @@ spec:
    {{ end }}
  selector:
 {{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-  {{ if .Values.network.enable_node_port }}
+  {{ if .Values.network.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@ -33,11 +33,13 @@ labels:
  node_selector_value: enabled

 network:
+  port: 80
  ingress:
    public: true
-  port: 80
-  node_port: 31000
-  enable_node_port: false
+  external_policy_local: false
+  node_port:
+    enabled: false
+    port: 31000

 # Use "True" and "False" as Titlecase strings with quotes, boolean
 # values will not work
--- a/keystone/templates/service-api.yaml
+++ b/keystone/templates/service-api.yaml
@ -37,5 +37,8 @@ spec:
 {{ tuple $envAll "keystone" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if or (.Values.network.api.node_port.enabled) (.Values.network.admin.node_port.enabled) }}
  type: NodePort
+  {{ if .Values.network.api.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@ -53,6 +53,7 @@ network:
    port: 80
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30500
--- a/magnum/templates/service-api.yaml
+++ b/magnum/templates/service-api.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "magnum" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.api.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.api.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@ -115,6 +115,7 @@ network:
  api:
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30511
--- a/neutron/templates/service-server.yaml
+++ b/neutron/templates/service-server.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "neutron" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.server.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.server.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@ -91,6 +91,7 @@ network:
    port: 9696
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30096
--- a/nova/templates/service-metadata.yaml
+++ b/nova/templates/service-metadata.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "nova" "metadata" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.metadata.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.metadata.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/nova/templates/service-osapi.yaml
+++ b/nova/templates/service-osapi.yaml
@ -32,5 +32,8 @@ spec:
 {{ tuple $envAll "nova" "os-api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
  {{ if .Values.network.osapi.node_port.enabled }}
  type: NodePort
+  {{ if .Values.network.osapi.external_policy_local }}
+  externalTrafficPolicy: Local
+  {{ end }}
  {{ end }}
 {{- end }}
--- a/nova/values.yaml
+++ b/nova/values.yaml
@ -109,6 +109,7 @@ network:
    port: 8774
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30774
@ -118,6 +119,7 @@ network:
    port: 8775
    ingress:
      public: true
+    external_policy_local: false
    node_port:
      enabled: false
      port: 30775