Skip to content

Commit

Permalink
fix: web service annotation ingress controller
Browse files Browse the repository at this point in the history
  • Loading branch information
olmax99 committed May 26, 2020
1 parent cedbf34 commit 0e8a6bd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Flask-Nginx Base Helm Deployment

This project can be used as a Helm template for building any Rest API project using Flask
and Nginx. It is assuming a K8s deployment in an AWS Kops cluster.
This project can be used as a Helm template for building any Rest API project using Flask.
It is assuming a K8s deployment in an AWS Kops cluster.

**NOTE: The actual Flask Api project is a separate project. This project's webapiservice and**
**workerservice are meant for demonstration purposes only.**
**NOTE: The actual Flask project would be a separate project. This project's webapiservice**
**and workerservice are meant for demonstration purposes only.**

---

Expand Down Expand Up @@ -264,7 +264,7 @@ webapi:
pullPolicy: IfNotPresent
nameOverride: baseapi-dev
envValues:
PYTHONPATH: "/usr/src/queue" <-- ENABLING PYTEST TO IMPORT FROM WORKER MODULES
PYTHONPATH: "/usr/src/app" <-- ENABLING PYTEST TO IMPORT MODULES
# -c will tell supervisord to start an alternative supervisord.conf, which
# in this case will just keep the docker alive instead of running nginx
extraArgs:
Expand Down
3 changes: 1 addition & 2 deletions flask-nginx-celery/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{{- $servicePortWeb := .Values.webapi.service.externalPort -}}
apiVersion: extensions/v1beta1
kind: Ingress
# TODO: In _helpers define "skaffold-helm.fullname" and "skaffold-helm.name"
metadata:
name: {{ template "basechart.name" . }}
namespace: {{ .Values.webapi.ingress.namespace }}
Expand All @@ -24,7 +23,7 @@ spec:
paths:
- path: /*
backend:
serviceName: {{ $serviceName }}
serviceName: {{ $serviceName }}-web
servicePort: {{ $servicePortWeb }}
{{- end -}}
{{- if .Values.worker.flower.enabled }}
Expand Down

0 comments on commit 0e8a6bd

Please sign in to comment.