airship/shipyard
Code Issues Proposed changes

[Fix] Update Shipyard Chart - Shipyard FQDN

Browse Source 
The 'proxy_read_timeout' needs to be a string instead of integer

Change-Id: Iaddbb617bb50ddc0aa70649662816e6dfab3d713
This commit is contained in:
Anthony Lin 2018-04-11 14:44:34 +00:00
parent c386815a63
commit 773fcd71cc
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
charts/shipyard/templates/ingress-shipyard-api.yaml
View File

@ -15,10 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.ingress_shipyard_api }}
{{- $envAll := . }}
{{- if .Values.network.shipyard.ingress.public }}
{{- $ingressOpts := dict "envAll" . "backendService" "shipyard" "backendServiceType" "shipyard" "backendPort" "http" -}}
{{- if and .Values.manifests.ingress_shipyard_api .Values.network.shipyard.ingress.public }}
{{- $ingressOpts := dict "envAll" . "backendService" "shipyard" "backendServiceType" "shipyard" "backendPort" "api" -}}
{{- $ingressOpts | include "helm-toolkit.manifests.ingress" -}}
{{- end }}
{{- end }}

14
charts/shipyard/templates/service-shipyard.yaml
View File

@ -25,16 +25,16 @@ metadata:
spec:
ports:
{{ if .Values.network.shipyard.enable_node_port }}
- name: http
- name: api
protocol: TCP
nodePort: {{ .Values.network.shipyard.node_port }}
port: {{ .Values.network.shipyard.port }}
protocol: TCP
targetPort: {{ .Values.network.shipyard.port }}
port: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
targetPort: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ else }}
- name: http
port: {{ .Values.network.shipyard.port }}
- name: api
protocol: TCP
targetPort: {{ .Values.network.shipyard.port }}
port: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
targetPort: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ end }}
selector:
{{ tuple $envAll "shipyard-api" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}

4
charts/shipyard/values.yaml
View File

@ -48,8 +48,8 @@ network:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/proxy_read_timeout: 600
port: 9000
nginx.ingress.kubernetes.io/rewrite-target: /
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
node_port: 31901
enable_node_port: false
airflow: