summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-20 05:50:58 +0000
committerGerrit Code Review <review@openstack.org>2019-02-20 05:50:58 +0000
commit40c8ca5dfc84a0ff152c86981fd06b0c3de07b81 (patch)
treec44fde2f5b4e751f2b604bb14a9370c3085fbc47
parent4f53ecd11108bf3c3fdb5981a6a6949b544825ac (diff)
parentad468883c6d431bcc8cd5c49452800ff7e93e294 (diff)
Merge "mini-mirror: Add ingress"
-rw-r--r--mini-mirror/templates/deployment-mini-mirror.yaml4
-rw-r--r--mini-mirror/templates/ingress-mini-mirror.yaml21
-rw-r--r--mini-mirror/templates/secret-ingress-tls.yaml21
-rw-r--r--mini-mirror/templates/service-ingress-mini-mirror.yaml21
-rw-r--r--mini-mirror/templates/service-mini-mirror.yaml6
-rw-r--r--mini-mirror/values.yaml25
6 files changed, 92 insertions, 6 deletions
diff --git a/mini-mirror/templates/deployment-mini-mirror.yaml b/mini-mirror/templates/deployment-mini-mirror.yaml
index 4dd6e77..3b888d6 100644
--- a/mini-mirror/templates/deployment-mini-mirror.yaml
+++ b/mini-mirror/templates/deployment-mini-mirror.yaml
@@ -40,8 +40,8 @@ spec:
40 - name: mini-mirror-api 40 - name: mini-mirror-api
41{{ tuple $envAll "mini-mirror" | include "helm-toolkit.snippets.image" | indent 10 }} 41{{ tuple $envAll "mini-mirror" | include "helm-toolkit.snippets.image" | indent 10 }}
42 ports: 42 ports:
43 - name: http 43 - name: api
44 containerPort: {{ tuple "api" "port" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} 44 containerPort: {{ tuple "api" "port" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
45{{ if .Values.network.api.node_port.enabled }} 45{{ if .Values.network.api.node_port.enabled }}
46 nodePort: {{ .Values.network.api.node_port.port }} 46 nodePort: {{ .Values.network.api.node_port.port }}
47{{ end }} 47{{ end }}
diff --git a/mini-mirror/templates/ingress-mini-mirror.yaml b/mini-mirror/templates/ingress-mini-mirror.yaml
new file mode 100644
index 0000000..642e378
--- /dev/null
+++ b/mini-mirror/templates/ingress-mini-mirror.yaml
@@ -0,0 +1,21 @@
1{{/*
2Copyright 2017 The Openstack-Helm Authors.
3Copyright 2019, AT&T Intellectual Property
4
5Licensed under the Apache License, Version 2.0 (the "License");
6you may not use this file except in compliance with the License.
7You may obtain a copy of the License at
8
9 http://www.apache.org/licenses/LICENSE-2.0
10
11Unless required by applicable law or agreed to in writing, software
12distributed under the License is distributed on an "AS IS" BASIS,
13WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14See the License for the specific language governing permissions and
15limitations under the License.
16*/}}
17
18{{- if and .Values.manifests.ingress .Values.network.api.ingress.public }}
19{{- $ingressOpts := dict "envAll" . "backendServiceType" "api" "backendPort" "api" -}}
20{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
21{{- end }}
diff --git a/mini-mirror/templates/secret-ingress-tls.yaml b/mini-mirror/templates/secret-ingress-tls.yaml
new file mode 100644
index 0000000..d6284eb
--- /dev/null
+++ b/mini-mirror/templates/secret-ingress-tls.yaml
@@ -0,0 +1,21 @@
1{{/*
2Copyright 2017-2018 The Openstack-Helm Authors.
3Copyright 2019, AT&T Intellectual Property
4
5Licensed under the Apache License, Version 2.0 (the "License");
6you may not use this file except in compliance with the License.
7You may obtain a copy of the License at
8
9 http://www.apache.org/licenses/LICENSE-2.0
10
11Unless required by applicable law or agreed to in writing, software
12distributed under the License is distributed on an "AS IS" BASIS,
13WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14See the License for the specific language governing permissions and
15limitations under the License.
16*/}}
17
18{{- if .Values.manifests.secret_ingress_tls }}
19{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "api" ) }}
20{{- end }}
21
diff --git a/mini-mirror/templates/service-ingress-mini-mirror.yaml b/mini-mirror/templates/service-ingress-mini-mirror.yaml
new file mode 100644
index 0000000..e674e2a
--- /dev/null
+++ b/mini-mirror/templates/service-ingress-mini-mirror.yaml
@@ -0,0 +1,21 @@
1{{/*
2Copyright 2017 The Openstack-Helm Authors.
3Copyright 2019, AT&T Intellectual Property
4
5Licensed under the Apache License, Version 2.0 (the "License");
6you may not use this file except in compliance with the License.
7You may obtain a copy of the License at
8
9 http://www.apache.org/licenses/LICENSE-2.0
10
11Unless required by applicable law or agreed to in writing, software
12distributed under the License is distributed on an "AS IS" BASIS,
13WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14See the License for the specific language governing permissions and
15limitations under the License.
16*/}}
17
18{{- if and .Values.manifests.service_ingress .Values.network.api.ingress.public }}
19{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "api" -}}
20{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
21{{- end }}
diff --git a/mini-mirror/templates/service-mini-mirror.yaml b/mini-mirror/templates/service-mini-mirror.yaml
index bf78171..ef42e08 100644
--- a/mini-mirror/templates/service-mini-mirror.yaml
+++ b/mini-mirror/templates/service-mini-mirror.yaml
@@ -20,14 +20,14 @@ limitations under the License.
20apiVersion: v1 20apiVersion: v1
21kind: Service 21kind: Service
22metadata: 22metadata:
23 name: {{ tuple "api" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} 23 name: {{ tuple "api" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
24spec: 24spec:
25 ports: 25 ports:
26 - name: http 26 - name: api
27{{ if .Values.network.api.node_port.enabled }} 27{{ if .Values.network.api.node_port.enabled }}
28 nodePort: {{ .Values.network.api.node_port.port }} 28 nodePort: {{ .Values.network.api.node_port.port }}
29{{ end }} 29{{ end }}
30 port: {{ .Values.endpoints.api.port.http.public }} 30 port: {{ tuple "api" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
31 protocol: TCP 31 protocol: TCP
32 targetPort: 80 32 targetPort: 80
33 selector: 33 selector:
diff --git a/mini-mirror/values.yaml b/mini-mirror/values.yaml
index 64a4ff7..ef1265a 100644
--- a/mini-mirror/values.yaml
+++ b/mini-mirror/values.yaml
@@ -110,12 +110,19 @@ endpoints:
110 public: mini-mirror 110 public: mini-mirror
111 host_fqdn_override: 111 host_fqdn_override:
112 default: null 112 default: null
113 # NOTE(drewwalters96): this chart supports TLS for fqdn over-ridden
114 # public endpoints using the following format:
115 # public:
116 # host: null
117 # tls:
118 # crt: null
119 # key: null
113 path: 120 path:
114 default: / 121 default: /
115 scheme: 122 scheme:
116 default: http 123 default: http
117 port: 124 port:
118 http: 125 api:
119 default: 8888 126 default: 8888
120 public: 80 127 public: 80
121 128
@@ -125,13 +132,29 @@ network:
125 node_port: 132 node_port:
126 enabled: false 133 enabled: false
127 port: 8888 134 port: 8888
135 ingress:
136 public: true
137 classes:
138 namespace: "nginx"
139 cluster: "nginx-cluster"
140 annotations:
141 nginx.ingress.kubernetes.io/rewrite-target: /
142
143secrets:
144 tls:
145 api:
146 api:
147 public: mini-mirror-tls-public
128 148
129manifests: 149manifests:
130 configmap_bin: true 150 configmap_bin: true
131 configmap_etc: true 151 configmap_etc: true
132 deployment_mini_mirror: true 152 deployment_mini_mirror: true
133 helm_test: true 153 helm_test: true
154 ingress: true
134 job_image_repo_sync: true 155 job_image_repo_sync: true
156 secret_ingress_tls: true
157 service_ingress: true
135 service_mini_mirror: true 158 service_mini_mirror: true
136 159
137conf: 160conf: