Improve the k8s manifest and other minor details #98
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "ExpandedNodes": [ | ||
| "" | ||
| ], | ||
| "SelectedNode": "\\C:\\Users\\jlecadou\\Source\\Repos\\azure-voting-app-redis", | ||
| "PreviewInSolutionExplorer": false | ||
| } | ||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [[source]] | ||
|
There was a problem hiding this comment. If the images aren't reading from this Pipfile, it can be removed |
||
| url = "https://pypi.org/simple" | ||
| verify_ssl = true | ||
| name = "pypi" | ||
|
|
||
| [packages] | ||
|
|
||
| [dev-packages] | ||
|
|
||
| [requires] | ||
| python_version = "3.11" | ||
| python_full_version = "3.11.2" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,13 @@ | ||
|
There was a problem hiding this comment. please remove the commented lines and the comment. The git history is sufficient to explain the change |
||
| # FROM tiangolo/uwsgi-nginx-flask:python3.6 | ||
|
|
||
| # Update the base image to use Python 3.11 | ||
| FROM tiangolo/uwsgi-nginx:python3.11 | ||
| LABEL maintainer="Sebastian Ramirez <[email protected]>" | ||
| # Make /app/* available to be imported by Python globally to better support several use cases like Alembic migrations. | ||
|
|
||
| ENV PYTHONPATH=/app | ||
|
|
||
|
|
||
|
|
||
| RUN pip install redis | ||
| ADD /azure-vote /app | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| # FROM tiangolo/uwsgi-nginx-flask:python3.6 | ||
|
|
||
| FROM tiangolo/uwsgi-nginx:python3.11 | ||
| LABEL maintainer="Sebastian Ramirez <[email protected]>" | ||
| ENV PYTHONPATH=/app | ||
|
|
||
| COPY sshd_config /etc/ssh/ | ||
| COPY app_init.supervisord.conf /etc/supervisor/conf.d | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. Please remove this from the branch and copy the contents into the PR description |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| # Improvements to azure-vote-all-in-one-redis.yaml | ||
|
|
||
| 1. Use resource requests and limits for both azure-vote-back and azure-vote-front containers to ensure they have predictable resource usage and prevent resource starvation. | ||
|
|
||
| 2. Set up liveness and readiness probes for both containers to improve the self-healing capabilities of your deployments and ensure the availability of your services. | ||
|
|
||
| ```yml | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: azure-vote-back | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| app: azure-vote-back | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: azure-vote-back | ||
| spec: | ||
| nodeSelector: | ||
| "kubernetes.io/os": linux | ||
| containers: | ||
| - name: azure-vote-back | ||
| image: mcr.microsoft.com/oss/bitnami/redis:6.0.8 | ||
| env: | ||
| - name: ALLOW_EMPTY_PASSWORD | ||
| value: "yes" | ||
| ports: | ||
| - containerPort: 6379 | ||
| name: redis | ||
| resources: | ||
| requests: | ||
| cpu: 100m | ||
| memory: 100Mi | ||
| limits: | ||
| cpu: 200m | ||
| memory: 200Mi | ||
| livenessProbe: | ||
| exec: | ||
| command: | ||
| - redis-cli | ||
| - ping | ||
| initialDelaySeconds: 15 | ||
| periodSeconds: 10 | ||
| readinessProbe: | ||
| exec: | ||
| command: | ||
| - redis-cli | ||
| - ping | ||
| initialDelaySeconds: 5 | ||
| periodSeconds: 10 | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: azure-vote-back | ||
| spec: | ||
| ports: | ||
| - port: 6379 | ||
| selector: | ||
| app: azure-vote-back | ||
| --- | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: azure-vote-front | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| app: azure-vote-front | ||
| strategy: | ||
| rollingUpdate: | ||
| maxSurge: 1 | ||
| maxUnavailable: 1 | ||
| minReadySeconds: 5 | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: azure-vote-front | ||
| spec: | ||
| nodeSelector: | ||
| "kubernetes.io/os": linux | ||
| containers: | ||
| - name: azure-vote-front | ||
| image: mcr.microsoft.com/azuredocs/azure-vote-front:v1 | ||
| ports: | ||
| - containerPort: 80 | ||
| resources: | ||
| requests: | ||
| cpu: 250m | ||
| memory: 128Mi | ||
| limits: | ||
| cpu: 500m | ||
| memory: 256Mi | ||
| env: | ||
| - name: REDIS | ||
| value: "azure-vote-back" | ||
| livenessProbe: | ||
| httpGet: | ||
| path: / | ||
| port: 80 | ||
| initialDelaySeconds: 15 | ||
| periodSeconds: 10 | ||
| readinessProbe: | ||
| httpGet: | ||
| path: / | ||
| port: 80 | ||
| initialDelaySeconds: 5 | ||
| periodSeconds: 10 | ||
| --- | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: azure-vote-front | ||
| spec: | ||
| type: LoadBalancer | ||
| ports: | ||
| - port: 80 | ||
| selector: | ||
| app: azure-vote-front | ||
| ``` | ||
|
|
||
| ## Changes made | ||
|
|
||
| 1. Added memory requests and limits to both `azure-vote-back` and `azure-vote-front` containers. | ||
| 2. Changed nodeSelector key from `beta.kubernetes.io/os` to `kubernetes.io/os` as the beta label has been deprecated. | ||
| 3. Added liveness |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove the
.vs/folder from this PRgit rm -r .vs --cachedor something similar would work