Merge "Ingress: Allow annotations to be dyanmicly driven"

barbican/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

barbican/values.yaml

@@ -134,6 +134,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false

ceilometer/templates/ingress-api.yaml

@@ -30,9 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
-    ingress.kubernetes.io/proxy-body-size: {{ .Values.network.api.ingress.proxy_body_size }}
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

ceilometer/values.yaml

@@ -58,6 +58,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     port: 8777
     node_port:
       enabled: false

cinder/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

cinder/values.yaml

@@ -218,6 +218,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false

congress/templates/ingress-api.yaml

@@ -30,9 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
-    ingress.kubernetes.io/proxy-body-size: {{ .Values.network.api.ingress.proxy_body_size | quote }}
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

congress/values.yaml

@@ -24,7 +24,9 @@ network:
   api:
     ingress:
       public: true
-      proxy_body_size: 1024M
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 1789

glance/templates/ingress-api.yaml

@@ -30,9 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
-    ingress.kubernetes.io/proxy-body-size: {{ .Values.network.api.ingress.proxy_body_size | quote }}
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

glance/templates/ingress-registry.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.registry.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

glance/values.yaml

@@ -274,7 +274,10 @@ network:
   api:
     ingress:
       public: true
-      proxy_body_size: 1024M
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
+        ingress.kubernetes.io/proxy-body-size: "1024M"
     external_policy_local: false
     node_port:
       enabled: false
@@ -282,6 +285,9 @@ network:
   registry:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false

gnocchi/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

gnocchi/values.yaml

@@ -27,6 +27,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false

heat/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

heat/templates/ingress-cfn.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.cfn.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

heat/templates/ingress-cloudwatch.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.cloudwatch.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

heat/values.yaml

@@ -221,6 +221,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false
@@ -228,12 +231,18 @@ network:
   cfn:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30800
   cloudwatch:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30003

horizon/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}

horizon/values.yaml

@@ -36,6 +36,9 @@ network:
   port: 80
   ingress:
     public: true
+    annotations:
+      kubernetes.io/ingress.class: "nginx"
+      ingress.kubernetes.io/rewrite-target: /
   external_policy_local: false
   node_port:
     enabled: false

keystone/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

keystone/values.yaml

@@ -53,6 +53,9 @@ network:
     port: 80
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false

magnum/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

magnum/values.yaml

@@ -115,6 +115,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false

mistral/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

mistral/values.yaml

@@ -43,6 +43,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 28989

neutron/templates/ingress-server.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.server.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

neutron/values.yaml

@@ -91,6 +91,9 @@ network:
     port: 9696
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false

nova/templates/ingress-metadata.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.metadata.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

nova/templates/ingress-osapi.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.osapi.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

nova/templates/ingress-placement.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.placement.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

nova/values.yaml

@@ -114,6 +114,9 @@ network:
     port: 8774
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false
@@ -124,6 +127,9 @@ network:
     port: 8775
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     external_policy_local: false
     node_port:
       enabled: false
@@ -132,6 +138,9 @@ network:
     port: 8778
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30778

senlin/templates/ingress-api.yaml

@@ -30,8 +30,7 @@ kind: Ingress
 metadata:
   name: {{ $ingressName }}
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
+{{ toJson .Values.network.api.ingress.annotations | indent 4 }}
 spec:
   rules:
 {{ if ne $hostNameNamespaced $hostNameFull }}

senlin/values.yaml

@@ -128,6 +128,9 @@ network:
   api:
     ingress:
       public: true
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30778